merge autotool build system by Christian Ruppert

git-svn-id: http://tint2.googlecode.com/svn/trunk@90 121b4492-b84c-0410-8b4c-0d4edfb3f3cc

src/Makefile

@@ -1,55 +0,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 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
-		MANDIR=/usr/share/man
-	else
-		BINDIR=$(PREFIX)/bin
-		XDG_CONFIG_DIR=/etc/xdg
-		MANDIR=/usr/share/man
-	endif
-else
-	BINDIR=$(DESTDIR)/usr/bin
-	XDG_CONFIG_DIR=$(DESTDIR)/etc/xdg
-	MANDIR=$(DESTDIR)/usr/share/man
-endif
-
-
-$(PROGNAME): $(FILES) $(SYSTRAYOBJ)
-	$(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-nostrip:
-	mkdir -p $(BINDIR)
-	mkdir -p $(XDG_CONFIG_DIR)/tint2
-	mkdir -p $(MANDIR)
-	mkdir -p $(MANDIR)/man1
-	install $(PROGNAME) $(BINDIR)
-	cp -f ../tintrc01 $(XDG_CONFIG_DIR)/tint2/tint2rc
-	cp -f ../doc/man/tint2.1 $(MANDIR)/man1
-
-uninstall:
-	rm -f $(BINDIR)/$(PROGNAME)
-	rm -f $(MANDIR)/man1/tint2.1
-
-clean:
-	rm -f $(PROGNAME)
-
-.PHONY: clean uninstall install install-strip install-nostrip

src/Makefile.am

@@ -0,0 +1,34 @@
+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
+
+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 \
+				util/area.c \
+				util/window.h \
+				util/window.c \
+				panel.h \
+				clock/clock.c \
+				clock/clock.h \
+				config.h \
+				tint.c \
+				panel.c \
+				server.c \
+				server.h \
+				systray/systraybar.h \
+				systray/systraybar.c \
+				taskbar/taskbar.c \
+				taskbar/task.c \
+				taskbar/taskbar.h \
+				taskbar/task.h \
+				battery/battery.c \
+				battery/battery.h
+
+DISTCLEANFILES = Makefile.in
+

src/panel.c

@@ -254,8 +254,8 @@ void set_panel_properties(Panel *p)
    }
 
    // Dock
-   long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
-   XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
+   //long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
+   //XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
    // Reserved space
    long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -276,7 +276,7 @@ void set_panel_properties(Panel *p)
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
 
    // Sticky and below other window
-   val = 0xFFFFFFFF;
+   long val = 0xFFFFFFFF;
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
    Atom state[4];
    state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;