small changes in Makefiles

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@731 e52654a7-88a9-db11-a3e9-0013d4bc506e
2011-06-06 20:35:56 +00:00
parent 06551d6084
commit c84997be30
14 changed files with 77 additions and 85 deletions
--- a/32
+++ b/32
@@ -1,5 +1,6 @@
 # Makefile for GNU make

+
 ifndef CXX
 CXX = g++
 endif
@@ -8,35 +9,41 @@ ifndef CXXFLAGS
 CXXFLAGS = -fPIC -Wall -pedantic -O2 -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -L/usr/local/lib -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
 endif

-
-
 export CXX
 export CXXFLAGS


+all: winix.so plugins winix



-all: winix
-
-winix: FORCE
+winix.so: FORCE
 	@cd core       ; $(MAKE) -e
 	@cd db         ; $(MAKE) -e
 	@cd functions  ; $(MAKE) -e
-	@cd templates  ; $(MAKE) -e
 	@cd notify     ; $(MAKE) -e
+	@cd templates  ; $(MAKE) -e
+	@cd ../ezc/src ; $(MAKE) -e
+	$(CXX) -shared -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a -lfcgi -lpq -lz -lpthread -lfetch
+
+
+winix: FORCE
+	@cd main       ; $(MAKE) -e
+	# use the full path with winix.so
+	$(CXX) -o winix $(CXXFLAGS) main/*.o /home/tomek/roboczy/winix/winix.so 
+
+
+
+plugins: FORCE
 	@cd plugins/stats     ; $(MAKE) -e
 	@cd plugins/thread    ; $(MAKE) -e
 	@cd plugins/ticket    ; $(MAKE) -e
 	@cd plugins/gallery   ; $(MAKE) -e
 	@cd plugins/groupitem ; $(MAKE) -e
-	@cd ../ezc/src ; $(MAKE) -e
-	$(CXX) -shared -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a -lfcgi -lpq -lz -lpthread -lfetch
-	@cd main       ; $(MAKE) -e
-	# use the full path with winix.so
-	$(CXX) -o winix $(CXXFLAGS) main/*.o /home/tomek/roboczy/winix/winix.so


+FORCE:
+

 clean:
 	@cd core                 ; $(MAKE) -e clean
@@ -55,7 +62,7 @@ clean:
 	rm -f winix


-FORCE:
+


 depend:
@@ -73,6 +80,7 @@ depend:
 	@cd main                 ; $(MAKE) -e depend


+
 install: all
 	# binaries
 	mkdir -p /usr/local/winix/bin
--- a/core/Makefile
+++ b/core/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep
--- a/core/dirs.cpp
+++ b/core/dirs.cpp
@@ -13,6 +13,7 @@



+
 void Dirs::SetDb(Db * pdb)
 {
 	db = pdb;
--- a/core/plugin.cpp
+++ b/core/plugin.cpp
@@ -148,6 +148,7 @@ void Plugin::LoadPlugin(const std::string & filename)
 }


+
 void * Plugin::LoadInitFun(const char * filename, Fun1 & fun_init)
 {
 	void * p = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
--- a/db/Makefile
+++ b/db/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep
--- a/functions/Makefile
+++ b/functions/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep
--- a/main/Makefile
+++ b/main/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep
--- a/notify/Makefile
+++ b/notify/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep
--- a/plugins/gallery/Makefile
+++ b/plugins/gallery/Makefile
@@ -3,14 +3,14 @@ include Makefile.o.dep
 name = gallery.so


-all: $(o)
+all: $(name)
+
+$(name): $(o)
 	$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o



-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


--- a/plugins/groupitem/Makefile
+++ b/plugins/groupitem/Makefile
@@ -3,14 +3,14 @@ include Makefile.o.dep
 name = groupitem.so


-all: $(o)
+all: $(name)
+
+$(name): $(o)
 	$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o



-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


--- a/plugins/stats/Makefile
+++ b/plugins/stats/Makefile
@@ -3,14 +3,14 @@ include Makefile.o.dep
 name = stats.so


-all: $(o)
+all: $(name)
+
+$(name): $(o)
 	$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o



-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


--- a/plugins/thread/Makefile
+++ b/plugins/thread/Makefile
@@ -3,14 +3,14 @@ include Makefile.o.dep
 name = thread.so


-all: $(o)
+all: $(name)
+
+$(name): $(o)
 	$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o



-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


--- a/plugins/ticket/Makefile
+++ b/plugins/ticket/Makefile
@@ -3,14 +3,14 @@ include Makefile.o.dep
 name = ticket.so


-all: $(o)
+all: $(name)
+
+$(name): $(o)
 	$(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o



-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


--- a/templates/Makefile
+++ b/templates/Makefile
@@ -4,13 +4,10 @@ include Makefile.o.dep
 all: $(o)


-.SUFFIXES: .cpp .o
-
-.cpp.o:
+%.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $<


-
 depend:
 	makedepend -Y. -I.. -I../../ezc/src -f- *.cpp > Makefile.dep
 	echo -n "o = " > Makefile.o.dep