Fixes for osx.

[spectrwm] / osx / Makefile

diff --git a/osx/Makefile b/osx/Makefile
index 9be08cf21c6586d216204750bff50d1be02bf0ac..e3924eb34f4e4992055b2032faf514713a0a4aa2 100644 (file)
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -1,8 +1,8 @@
-# $scrotwm$ 
-
-CFLAGS+= -O2 -Wall -ggdb -D_GNU_SOURCE -D__OSX__ -I.
+INCFLAGS+= -I/opt/local/include/freetype2 -I/opt/local/include
+CFLAGS+= -O2 -Wall -g -D_GNU_SOURCE -D__OSX__ -I. -I.. ${INCFLAGS}
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-LDADD+=  -L/usr/X11/lib/ -lX11 -lXrandr -lXtst
+LDADD+=  -L/opt/local/lib -lX11 -lXcursor -lXft
+LDADD+=  -lxcb-keysyms -lxcb-util -lxcb-randr -lX11-xcb -lxcb-xtest -lxcb -lxcb-icccm
 
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
@@ -13,15 +13,16 @@ CC= gcc
 
 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
 
-all: scrotwm libswmhack.so.$(LVERS)
+all: spectrwm libswmhack.so.$(LVERS)
 
-scrotwm.c:
-       ln -sf ../scrotwm.c
+spectrwm.c:
+       ln -sf ../linux/tree.h
+       ln -sf ../spectrwm.c
 
 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
@@ -36,15 +37,16 @@ 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
+       install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1
+       install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
+       install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
+       install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
+       ln -sf $(DESTDIR)$(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm
 
 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
 
 .PHONY: all install clean