added: dependency on the morm project

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1074 e52654a7-88a9-db11-a3e9-0013d4bc506e

winixd/Makefile

@@ -72,7 +72,8 @@ winix.so: $(winix.src.files)
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src   ; $(MAKE) -e
 	@cd $(GLOBAL_WORKING_DIR)/tito/src  ; $(MAKE) -e
 	@cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e
-	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
+	@cd $(GLOBAL_WORKING_DIR)/morm/src  ; $(MAKE) -e
+	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
 
 
 winix: winix.so $(winix.src.files)
@@ -112,6 +113,7 @@ clean:
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src           ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/tito/src          ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e clean
+	@cd $(GLOBAL_WORKING_DIR)/morm/src          ; $(MAKE) -e clean
 	@cd main                 ; $(MAKE) -e clean
 	rm -f winix.so
 	rm -f winix
@@ -139,11 +141,12 @@ depend:
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e depend
 	@cd main                 ; $(MAKE) -e depend
 	echo -n "winix.src.files = " > Makefile.dep
-	find -E .            -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
+	find -E . -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
 	# use $(global_relative_working_dir) here to put relative paths to Makefile.dep
 	find -E $(global_relative_working_dir)/ezc/src   -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
 	find -E $(global_relative_working_dir)/tito/src  -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
 	find -E $(global_relative_working_dir)/pikotools -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
+	find -E $(global_relative_working_dir)/morm/src  -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep