Prepared build-system for tint2conf.

[chaz/tint2] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 43d95e78acd2dadc500a8795634cc56f196c06b8..636136683a7bd8747d7a7c67a7e1fc698f99fa01 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,12 @@
-AM_CFLAGS = -Wall
-AM_CFLAGS += @PANGOCAIRO_CFLAGS@ @PANGO_CFLAGS@ @CAIRO_CFLAGS@ @GLIB2_CFLAGS@ @GOBJECT2_CFLAGS@ @X11_CFLAGS@ @XINERAMA_CFLAGS@ @IMLIB2_CFLAGS@
+if ENABLE_TINT2CONF
+SUBDIRS = tint2conf
+endif
 
-AM_LDFLAGS = -Wl,--as-needed
+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
 
 bin_PROGRAMS = tint2
-LIBS = @PANGOCAIRO_LIBS@ @PANGO_LIBS@ @CAIRO_LIBS@ @GLIB2_LIBS@ @GOBJECT2_LIBS@ @X11_LIBS@ @XINERAMA_LIBS@ @IMLIB2_LIBS@
-#noinst_LIBRARIES
-INCLUDES = -Iutil -Ibattery -Iclock -Itaskbar -Isystray
 tint2_SOURCES = config.c \
                                util/area.h \
                                util/common.h \
@@ -26,9 +26,12 @@ tint2_SOURCES = config.c \
                                taskbar/taskbar.c \
                                taskbar/task.c \
                                taskbar/taskbar.h \
-                               taskbar/task.h \
-                               battery/battery.c \
-                               battery/battery.h
+                               taskbar/task.h 
 
-DISTCLEANFILES = Makefile.in
+if ENABLE_BATTERY
+DEFS += -DENABLE_BATTERY
+INCLUDES += -Ibattery
+tint2_SOURCES += battery/battery.c \
+                                battery/battery.h
+endif