X-Git-Url: https://git.auder.net/?p=cgds.git;a=blobdiff_plain;f=Makefile;h=640ed2e750c344c972fb34a4e62b86728abda1b8;hp=66c4f3a7d15ccc72813eadb80c37b850eabbe928;hb=HEAD;hpb=a78687686f5b490d99fae21f9fa8aaa9a34f1812

diff --git a/Makefile b/Makefile
index 66c4f3a..640ed2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,32 @@
-#http://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line
-#to reconstruct dependency rules or not
-
 LIBRARY = libcgds.so
 INSTALL_PREFIX = /usr/local
 
+all: src
+
 src:
-	cd src && make && cd ..
+	cd src && $(MAKE) && cd ..
 
 test:
-	cd test && make && cd ..
+	cd test && ./makeMain.sh && $(MAKE) && cd ..
 
 doc:
-	cd doc && make && cd ..
+	cd doc && $(MAKE) && cd ..
 
 clean:
-	cd src && make clean && cd ..
-	cd test && make clean && cd ..
-	cd doc && make clean && cd ..
+	cd src && $(MAKE) clean && cd ..
+	cd test && $(MAKE) clean && cd ..
+	cd doc && $(MAKE) clean && cd ..
 
 install:
-#	if [ ! -e src/obj/libcds.so ]; then make src; fi
+	mkdir -p $(INSTALL_PREFIX)/lib/
 	cp src/obj/$(LIBRARY) $(INSTALL_PREFIX)/lib/
 	mkdir -p $(INSTALL_PREFIX)/include/cgds
 	cp src/*.h $(INSTALL_PREFIX)/include/cgds/
+	mv $(INSTALL_PREFIX)/include/cgds/cgds.h $(INSTALL_PREFIX)/include/
 
 uninstall:
 	rm -f ${INSTALL_PREFIX}/lib/${LIBRARY}
+	rm -f ${INSTALL_PREFIX}/include/cgds.h
 	[[ -d ${INSTALL_PREFIX}/include/cgds ]] && rm -rf ${INSTALL_PREFIX}/include/cgds
 
 .PHONY: src test doc clean install uninstall