fixed issue 56 : with windowmaker

[chaz/tint2] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 4da3f66d72336fdb424e8f3376e56ba06884e1dd..34172db4779ab3807d74510afac6192ccf05c13c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,43 +1,55 @@
-#CFLAGS="-O2"
-FLAGS=-Wall -g `pkg-config --cflags --libs cairo pangocairo x11 xinerama imlib2 glib-2.0`
+CFLAGS= -O2
+CC = gcc
+FLAGS=-Wall -g `pkg-config --cflags --libs cairo pangocairo x11 xinerama xrandr imlib2 glib-2.0`
 PROGNAME=tint2
-FILES=tint.c server.c panel.c config.c taskbar/task.c taskbar/taskbar.c clock/clock.c systray/docker.c systray/icons.c systray/kde.c systray/net.c systray/xproperty.c util/window.c util/area.c
+FILES=tint.c server.c panel.c config.c taskbar/task.c taskbar/taskbar.c battery/battery.c clock/clock.c systray/systraybar.c util/window.c util/area.c
 
 ifndef DESTDIR
        ifndef PREFIX
                BINDIR=/usr/bin
                XDG_CONFIG_DIR=/etc/xdg
-               MAN_DIR=/usr/share/man
+               MANDIR=/usr/share/man
        else
                BINDIR=$(PREFIX)/bin
                XDG_CONFIG_DIR=/etc/xdg
-               MAN_DIR=/usr/share/man
+               MANDIR=/usr/share/man
        endif
 else
        BINDIR=$(DESTDIR)/usr/bin
        XDG_CONFIG_DIR=$(DESTDIR)/etc/xdg
-       MAN_DIR=$(DESTDIR)/usr/share/man
+       MANDIR=$(DESTDIR)/usr/share/man
 endif
 
 
 $(PROGNAME): $(FILES) $(SYSTRAYOBJ)
-       $(CC) $(CFLAGS) $(FLAGS) -I. -Iutil -Iclock -Itaskbar -Isystray -o $(PROGNAME) $(FILES) 
+       $(CC) $(CFLAGS) -I. -Iutil -Ibattery -Iclock -Itaskbar -Isystray -o $(PROGNAME) $(FILES) $(FLAGS)
+       
+install: install-strip
+
+install-strip:
+       mkdir -p $(BINDIR)
+       mkdir -p $(XDG_CONFIG_DIR)/tint2
+       mkdir -p $(MANDIR)
+       mkdir -p $(MANDIR)/man1
        strip $(PROGNAME)
+       install $(PROGNAME) $(BINDIR)
+       cp -f ../tintrc01 $(XDG_CONFIG_DIR)/tint2/tint2rc
+       cp -f ../doc/man/tint2.1 $(MANDIR)/man1
 
-install:
+install-nostrip:
        mkdir -p $(BINDIR)
        mkdir -p $(XDG_CONFIG_DIR)/tint2
        mkdir -p $(MANDIR)
        mkdir -p $(MANDIR)/man1
        install $(PROGNAME) $(BINDIR)
-       cp -f ../tintrc06 $(XDG_CONFIG_DIR)/tint2/tint2rc
-       cp -f ../doc/man/tint2.1 $(MAN_DIR)/man1
+       cp -f ../tintrc01 $(XDG_CONFIG_DIR)/tint2/tint2rc
+       cp -f ../doc/man/tint2.1 $(MANDIR)/man1
 
 uninstall:
        rm -f $(BINDIR)/$(PROGNAME)
-       rm -f $(MAN_DIR)/man1/tint2.1
+       rm -f $(MANDIR)/man1/tint2.1
 
 clean:
        rm -f $(PROGNAME)
 
-.PHONY: clean uninstall install
+.PHONY: clean uninstall install install-strip install-nostrip