X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=bed18643c99f293676c0e2823343028dc77bb9ff;hb=a3eabee391c4c2b575ec021bde4e66bd84191f75;hp=6b83cd4deb5d24b8354f9734abf08829cf5fbd7b;hpb=3ad3e76e075ac8c26668c6ae967758f397855aad;p=chaz%2Ftint2

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b83cd4..bed1864 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,16 @@
-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
+INCLUDES = -Iutil -Iclock -Itaskbar -Isystray -Itooltip
 
 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,14 @@ tint2_SOURCES = config.c \
 				taskbar/taskbar.c \
 				taskbar/task.c \
 				taskbar/taskbar.h \
-				taskbar/task.h 
+				taskbar/task.h \
+				tooltip/tooltip.c \
+				tooltip/tooltip.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
-
-