From: Andy Spencer <andy753421@gmail.com>
Date: Sun, 3 Jun 2012 06:57:08 +0000 (+0000)
Subject: Update makefiles
X-Git-Url: http://pileus.org/git/?p=wmpus;a=commitdiff_plain;h=5be9819351adc30537e01f34f5bf8bff28350e0e

Update makefiles
---

diff --git a/config.mk.example b/config.mk.example
index 914a19d..df79c86 100644
--- a/config.mk.example
+++ b/config.mk.example
@@ -1,4 +1,6 @@
-wm-wmii.o: CFLAGS += -DDEBUG -DMODKEY=ctrl
+# Set default install and compile flags
+#PREFIX = /usr
+#CFLAGS = -Os
 
-test: $(PROG)
-	DISPLAY=:2.0 ./wmpus
+# Build in debugging and use a different modifier key
+#wm-wmii.o: CFLAGS += -DDEBUG -DMODKEY=ctrl
diff --git a/makefile b/makefile
index f9ad109..fb14b4d 100644
--- a/makefile
+++ b/makefile
@@ -1,27 +1,51 @@
-WM     ?= wmii
-SYS    ?= x11
-CFLAGS ?= -g -Wall -Werror
+# wmpus - cross platofrm window manager
+# See LICENSE file for copyright and license details.
+
+undefine CC
+
+-include config.mk
+
+VERSION   ?= 0.1
+WM        ?= wmii
+SYS       ?= x11
+CFLAGS    ?= -g -Wall
+PREFIX    ?= /usr/local
+MANPREFIX ?= ${PREFIX}/share/man
 
 ifeq ($(SYS),x11)
-CC      = gcc
-LIBS   += -lX11 -lXinerama
-PROG    = wmpus
+CC        ?= gcc
+PROG      ?= wmpus
+LDFLAGS   += -lX11 -lXinerama
 endif
 
 ifeq ($(SYS),win32)
-CC      = i686-pc-mingw32-gcc
-CFLAGS += -D_MODE_T_
-LIBS   += -lgdi32
-PROG    = wmpus.exe
+CC        ?= i686-pc-mingw32-gcc
+PROG      ?= wmpus.exe
+CFLAGS    += -D_MODE_T_
+LDFLAGS   += -lgdi32
 endif
 
-include config.mk
+all: $(PROG)
+
+clean:
+	rm -f wmpus *.exe *.o
+
+dist:
+	tar -czf wmpus-$(VERSION).tar.gz --transform s::wmpus-$(VERSION)/: \
+		README LICENSE config.mk.example makefile *.1 *.c *.h
+
+install: all
+	install -m 755 -D $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
+	install -m 644 -D wmpus.1 $(DESTDIR)$(MANPREFIX)/man1/wmpus.1
+
+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 $@ $+ $(LIBS)
+	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 %.o: %.c $(wildcard *.h) makefile
-	$(CC) --std=gnu99 $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) --std=gnu99 -c -o $@ $<
 
-clean:
-	rm -f wmpus *.exe *.o
+.PHONY: all clean dist install uninstall