# HG changeset patch # User John Tsiombikas # Date 1317099121 -10800 # Node ID 3c0a306c5f01b09537084de793163c1cf4df3491 # Parent d774738f50f6009eba30204f58fa4f5580c75626 revamped the makefile a bit and changed all to to avoid relying on pkg-config diff -r d774738f50f6 -r 3c0a306c5f01 Makefile.in --- a/Makefile.in Tue Sep 27 07:42:54 2011 +0300 +++ b/Makefile.in Tue Sep 27 07:52:01 2011 +0300 @@ -1,45 +1,49 @@ src = $(wildcard src/*.c) obj = $(src:.c=.o) +dep = $(obj:.o=.d) lib_a = libpsys.a -lib_so = libpsys.so + +ifeq ($(shell uname -s), Darwin) + lib_so = psys.dylib + shared = -dynamiclib +else + somajor = 0 + sominor = 1 + soname = libpsys.so.$(somajor) + lib_so = $(soname).$(sominor) + solink = libpsys.so + shared = -shared -Wl,-soname,$(soname) +endif + CC = gcc -CFLAGS = -std=c89 -pedantic -Wall -g -fPIC -Isrc `pkg-config --cflags vmath` -LDFLAGS = `pkg-config --libs vmath` +AR = ar +CFLAGS = -std=c89 -pedantic -Wall -g -fPIC -Isrc +LDFLAGS = -lanim -limago -lvmath .PHONY: all all: $(lib_a) $(lib_so) $(lib_a): $(obj) - $(AR) rcs $@ $^ + $(AR) rcs $@ $(obj) $(lib_so): $(obj) - $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) + $(CC) $(shared) -o $@ $(obj) $(LDFLAGS) + +-include $(dep) + +%.d: %.c + @$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@ + .PHONY: install install: $(lib_a) $(lib_so) - install -d $(PREFIX)/lib - install -m 644 $(lib_a) $(lib_so) $(PREFIX)/lib - install -d $(PREFIX)/include - install -m 644 src/psys.h $(PREFIX)/include/psys.h - install -d $(PREFIX)/lib/pkgconfig - install -m 644 psys.pc $(PREFIX)/lib/pkgconfig/psys.pc + @echo TODO .PHONY: uninstall uninstall: - rm -f $(PREFIX)/lib/$(lib_a) - rm -f $(PREFIX)/lib/$(lib_so) - rm -f $(PREFIX)/include/psys.h - rm -f $(PREFIX)/lib/pkgconfig/psys.pc + @echo TODO .PHONY: clean clean: - rm -f $(obj) - -.PHONY: distclean -distclean: - rm -f $(obj) $(lib_so) $(lib_a) Makefile psys.pc - -.PHONY: dist -dist: distclean - cd ..; tar czvf psys.tar.gz psys && mv psys.tar.gz psys/ + rm -f $(obj) $(lib_so) $(lib_a) diff -r d774738f50f6 -r 3c0a306c5f01 src/pstrack.h --- a/src/pstrack.h Tue Sep 27 07:42:54 2011 +0300 +++ b/src/pstrack.h Tue Sep 27 07:52:01 2011 +0300 @@ -1,7 +1,7 @@ #ifndef PSTRACK_H_ #define PSTRACK_H_ -#include +#include #include struct psys_track { diff -r d774738f50f6 -r 3c0a306c5f01 src/psys.c --- a/src/psys.c Tue Sep 27 07:42:54 2011 +0300 +++ b/src/psys.c Tue Sep 27 07:52:01 2011 +0300 @@ -2,7 +2,6 @@ #include #include #include -#include #include "psys.h" #include "psys_gl.h" diff -r d774738f50f6 -r 3c0a306c5f01 src/psys.h --- a/src/psys.h Tue Sep 27 07:42:54 2011 +0300 +++ b/src/psys.h Tue Sep 27 07:52:01 2011 +0300 @@ -1,7 +1,7 @@ #ifndef LIBPSYS_H_ #define LIBPSYS_H_ -#include +#include #include #include "rndval.h" #include "pattr.h" diff -r d774738f50f6 -r 3c0a306c5f01 src/rndval.h --- a/src/rndval.h Tue Sep 27 07:42:54 2011 +0300 +++ b/src/rndval.h Tue Sep 27 07:52:01 2011 +0300 @@ -1,7 +1,7 @@ #ifndef RNDVAL_H_ #define RNDVAL_H_ -#include +#include #include "pstrack.h" struct psys_rnd {