X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=400ce7a50c8dc4fe309edca2aadfab2e7d77fb38;hb=84fdb5249282e858b32f59f49a877a07350a48eb;hp=11519b2f285665874812ae4537afda0e6eda7380;hpb=7adfbf8f1eb3d64d2318d6e35dcccdcfdb9fa16a;p=wmpus

diff --git a/makefile b/makefile
index 11519b2..400ce7a 100644
--- a/makefile
+++ b/makefile
@@ -1,25 +1,29 @@
 # wmpus - cross platofrm window manager
 # See LICENSE file for copyright and license details.
 
-undefine CC
-
 -include config.mk
 
-VERSION   ?= 0.1-p0
+VERSION   ?= 0.1-rc1
 WM        ?= wmii
 SYS       ?= x11
 CFLAGS    ?= -g -Wall
 PREFIX    ?= /usr/local
 MANPREFIX ?= ${PREFIX}/share/man
 
-ifeq ($(SYS),x11)
-CC        ?= gcc
+ifeq ($(SYS),xcb)
+GCC       ?= gcc
+PROG      ?= wmpus
+LDFLAGS   += -lxcb -lxcb-keysyms -lxcb-util -lxcb-ewmh -lxcb-xinerama
+endif
+
+ifeq ($(SYS),xlib)
+GCC       ?= gcc
 PROG      ?= wmpus
 LDFLAGS   += -lX11 -lXinerama
 endif
 
 ifeq ($(SYS),win32)
-CC        ?= i686-pc-mingw32-gcc
+GCC       ?= mingw32-gcc
 PROG      ?= wmpus.exe
 LDFLAGS   += -lgdi32
 endif
@@ -34,17 +38,20 @@ dist:
 		README LICENSE config.mk.example makefile *.1 *.c *.h
 
 install: all
+	sed -i 's:/usr.*:$(PREFIX)/bin/wmpus:' wmpus.session
 	install -m 755 -D $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
 	install -m 644 -D wmpus.1 $(DESTDIR)$(MANPREFIX)/man1/wmpus.1
+	install -m 755 -D wmpus.session $(DESTDIR)/etc/X11/Sessions/wmpus
+	install -m 644 -D wmpus.desktop $(DESTDIR)$(PREFIX)/share/xsessions/wmpus.desktop
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG)
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/wmpus.1
 
 $(PROG): main.o conf.o util.o sys-$(SYS).o wm-$(WM).o
-	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
+	$(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(wildcard *.h) makefile
-	$(CC) $(CFLAGS) --std=gnu99 -c -o $@ $<
+	$(GCC) $(CFLAGS) --std=gnu99 -c -o $@ $<
 
 .PHONY: all clean dist install uninstall