fixed segfault

[chaz/tint2] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b83cd4deb5d24b8354f9734abf08829cf5fbd7b..7441734c8ca514e2ed6cbe5dd17c84fcb555eb8e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
-AM_CFLAGS = -Wall
-AM_CFLAGS += @PANGOCAIRO_CFLAGS@ @PANGO_CFLAGS@ @CAIRO_CFLAGS@ @GLIB2_CFLAGS@ @GOBJECT2_CFLAGS@ @X11_CFLAGS@ @XINERAMA_CFLAGS@ @IMLIB2_CFLAGS@
-
-AM_LDFLAGS = -Wl,--as-needed
+if ENABLE_TINT2CONF
+SUBDIRS = tint2conf
+endif
 
+AM_CFLAGS += @PANGOCAIRO_CFLAGS@ @PANGO_CFLAGS@ @CAIRO_CFLAGS@ @GLIB2_CFLAGS@ @GOBJECT2_CFLAGS@ @X11_CFLAGS@ @XINERAMA_CFLAGS@ @IMLIB2_CFLAGS@
 LIBS = @PANGOCAIRO_LIBS@ @PANGO_LIBS@ @CAIRO_LIBS@ @GLIB2_LIBS@ @GOBJECT2_LIBS@ @X11_LIBS@ @XINERAMA_LIBS@ @IMLIB2_LIBS@
 INCLUDES = -Iutil -Iclock -Itaskbar -Isystray
 
@@ -10,6 +10,7 @@ bin_PROGRAMS = tint2
 tint2_SOURCES = config.c \
                                util/area.h \
                                util/common.h \
+                               util/common.c \
                                util/area.c \
                                util/window.h \
                                util/window.c \
@@ -26,15 +27,12 @@ tint2_SOURCES = config.c \
                                taskbar/taskbar.c \
                                taskbar/task.c \
                                taskbar/taskbar.h \
-                               taskbar/task.h 
+                               taskbar/task.h
 
 if ENABLE_BATTERY
-AM_CFLAGS += -DENABLE_BATTERY
+DEFS += -DENABLE_BATTERY
 INCLUDES += -Ibattery
 tint2_SOURCES += battery/battery.c \
                                 battery/battery.h
 endif
 
-DISTCLEANFILES = Makefile.in
-
-