X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/8e2b81c30c23419c24e121329ee113e55f159d54..HEAD:/osx/Makefile

diff --git a/osx/Makefile b/osx/Makefile
index 9be08cf..898a1ac 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,34 +1,54 @@
-# $scrotwm$ 
-
-CFLAGS+= -O2 -Wall -ggdb -D_GNU_SOURCE -D__OSX__ -I.
-CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-LDADD+=  -L/usr/X11/lib/ -lX11 -lXrandr -lXtst
-
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
 LIBDIR?= $(PREFIX)/lib
 MANDIR?= $(PREFIX)/share/man
 
-CC= gcc
+BUILDVERSION    = $(shell sh $(CURDIR)/../buildver.sh)
+
+# To use xquartz, uncomment the following three lines.
+INCFLAGS+= -I/opt/X11/include -I/opt/X11/include/freetype2/
+LDADD+=  -L/opt/X11/lib -lX11 -lXcursor -lXft
+
+# To use homebrew, uncomment the following three lines.
+#INCFLAGS+= -I/opt/X11/include
+#LDADD+=  -lX11 -lXcursor -lXft -L/opt/X11/lib
+#INCFLAGS+= -I/usr/local/Cellar/freetype/2.5.0.1/include/freetype2
+
+# To use homebrew , comment out the following two lines.
+#INCFLAGS+= -I/opt/local/include/freetype2 -I/opt/local/include
+#LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
+
+LDADD+=  -lxcb-keysyms -lxcb-util -lxcb-randr -lX11-xcb -lxcb-xtest -lxcb -lxcb-icccm
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
-all: scrotwm libswmhack.so.$(LVERS)
+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+CFLAGS+= -O2 -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
+CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
+ifneq ("${BUILDVERSION}", "")
+CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+endif
+
+CC?= cc
+
+all: spectrwm libswmhack.so.$(LVERS)
 
-scrotwm.c:
-	ln -sf ../scrotwm.c
+spectrwm.c:
+	ln -sf ../linux/tree.h
+	ln -sf ../spectrwm.c
+	ln -sf ../version.h
 
 swm_hack.c:
 	ln -sf ../lib/swm_hack.c
 
-scrotwm: scrotwm.o osx.o
+spectrwm: spectrwm.o osx.o
 	$(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
 
 %.so: %.c
 	$(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
 
 libswmhack.so.$(LVERS): swm_hack.so
-	$(CC) -shared -fpic -o libswmhack.so.$(LVERS) $(LDADD) swm_hack.so
+	$(CC) $(LDFLAGS) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
 # replace above line with this for OSX 10.5
 #	$(CC) -shared -bundle -fpic -o libswmhack.so.$(LVERS) $(LDADD) swm_hack.so
 
@@ -36,15 +56,14 @@ install: all
 	install -m 755 -d $(DESTDIR)$(BINDIR)
 	install -m 755 -d $(DESTDIR)$(LIBDIR)
 	install -m 755 -d $(DESTDIR)$(MANDIR)/man1
-	install -m 755 scrotwm $(DESTDIR)$(BINDIR)
+	install -m 755 spectrwm $(DESTDIR)$(BINDIR)
 	install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)
-	install -m 644 ../scrotwm.1 $(DESTDIR)$(MANDIR)/man1/scrotwm.1
-	install -m 644 ../scrotwm_es.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_es.1
-	install -m 644 ../scrotwm_it.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_it.1
-	install -m 644 ../scrotwm_pt.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_pt.1
-	install -m 644 ../scrotwm_ru.1 $(DESTDIR)$(MANDIR)/man1/scrotwm_ru.1
+	install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1
+	ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm
+	ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0
+	ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so
 
 clean:
-	rm -f scrotwm *.o *.so libswmhack.so.* scrotwm.c swm_hack.c
+	rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c tree.h version.h
 
 .PHONY: all install clean