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
 
 
 

winixd/Makefile.dep

@@ -1 +1 @@
-winix.src.files = ./templates/miscspace.h  ./templates/generic.cpp  ./templates/sys.cpp  ./templates/user.cpp  ./templates/currentdate.cpp  ./templates/textextstream.cpp  ./templates/upload.cpp  ./templates/patterncacher.h  ./templates/env.cpp  ./templates/indexpatterns.cpp  ./templates/htmltextstream.h  ./templates/who.cpp  ./templates/locale.cpp  ./templates/misc.h  ./templates/patterns.cpp  ./templates/passwd.cpp  ./templates/mount.cpp  ./templates/templates.h  ./templates/last.cpp  ./templates/uptime.cpp  ./templates/insert.cpp  ./templates/doc.cpp  ./templates/changepatterns.cpp  ./templates/server.cpp  ./templates/miscspace.cpp  ./templates/login.cpp  ./templates/filters.cpp  ./templates/localefilter.h  ./templates/man.cpp  ./templates/ls.cpp  ./templates/dir.cpp  ./templates/priv.cpp  ./templates/rebus.cpp  ./templates/patterncacher.cpp  ./templates/htmltextstream.cpp  ./templates/textextstream.h  ./templates/adduser.cpp  ./templates/ipban.cpp  ./templates/misc.cpp  ./templates/indexpatterns.h  ./templates/item.cpp  ./templates/templates.cpp  ./templates/winix.cpp  ./templates/slog.cpp  ./templates/locale.h  ./templates/patterns.h  ./templates/config.cpp  ./templates/localefilter.cpp  ./templates/changepatterns.h  ./templates/stat.cpp  ./templates/template.cpp  ./plugins/mailregister/funregistermail_showusers.h  ./plugins/mailregister/mdb.h  ./plugins/mailregister/registermail_info.h  ./plugins/mailregister/templates.cpp  ./plugins/mailregister/funregistermail.cpp  ./plugins/mailregister/funregistermail_showusers.cpp  ./plugins/mailregister/mdb.cpp  ./plugins/mailregister/registermail_info.cpp  ./plugins/mailregister/init.cpp  ./plugins/mailregister/funregistermail.h  ./plugins/thread/tdb.cpp  ./plugins/thread/pluginmsg.h  ./plugins/thread/thread.h  ./plugins/thread/tdb.h  ./plugins/thread/funthread.cpp  ./plugins/thread/threadinfo.cpp  ./plugins/thread/funthread.h  ./plugins/thread/threadinfo.h  ./plugins/thread/createthread.cpp  ./plugins/thread/reply.cpp  ./plugins/thread/showthreads.cpp  ./plugins/thread/templates.cpp  ./plugins/thread/createthread.h  ./plugins/thread/reply.h  ./plugins/thread/showthreads.h  ./plugins/thread/init.cpp  ./plugins/thread/templates.h  ./plugins/group/groupinfo.h  ./plugins/group/templates.cpp  ./plugins/group/groups.cpp  ./plugins/group/init.cpp  ./plugins/group/groups.h  ./plugins/group/groupinfo.cpp  ./plugins/stats/bot.cpp  ./plugins/stats/statssession.h  ./plugins/stats/bot.h  ./plugins/stats/stats.cpp  ./plugins/stats/templates.cpp  ./plugins/stats/init.cpp  ./plugins/stats/stats.h  ./plugins/stats/templates.h  ./plugins/gallery/gallery.h  ./plugins/gallery/galleryinfo.cpp  ./plugins/gallery/templates.cpp  ./plugins/gallery/gallery.cpp  ./plugins/gallery/galleryinfo.h  ./plugins/gallery/init.cpp  ./plugins/export/init.cpp  ./plugins/export/export.h  ./plugins/export/exportthread.cpp  ./plugins/export/message.h  ./plugins/export/edb.cpp  ./plugins/export/funexport.cpp  ./plugins/export/exportinfo.cpp  ./plugins/export/exportthread.h  ./plugins/export/edb.h  ./plugins/export/funexport.h  ./plugins/export/exportinfo.h  ./plugins/ticket/sessiondata.h  ./plugins/ticket/ticket.h  ./plugins/ticket/editticket.cpp  ./plugins/ticket/funticket.cpp  ./plugins/ticket/templates.cpp  ./plugins/ticket/editticket.h  ./plugins/ticket/ticketinfo.cpp  ./plugins/ticket/funticket.h  ./plugins/ticket/init.cpp  ./plugins/ticket/ticketinfo.h  ./plugins/ticket/createticket.cpp  ./plugins/ticket/showtickets.cpp  ./plugins/ticket/tdb.cpp  ./plugins/ticket/pluginmsg.h  ./plugins/ticket/showtickets.h  ./plugins/ticket/createticket.h  ./plugins/ticket/sessiondata.cpp  ./plugins/ticket/tdb.h  ./plugins/menu/cache.cpp  ./plugins/menu/init.cpp  ./plugins/menu/cache.h  ./plugins/menu/templates.cpp  ./main/main.cpp  ./db/dbbase.cpp  ./db/dbconn.cpp  ./db/db.cpp  ./db/dbbase.h  ./db/dbitemcolumns.cpp  ./db/dbtextstream.cpp  ./db/dbconn.h  ./db/db.h  ./db/dbitemcolumns.h  ./db/dbitemquery.cpp  ./db/dbtextstream.h  ./db/dbitemquery.h  ./core/loadavg.h  ./core/session.cpp  ./core/user.h  ./core/mountparser.h  ./core/mounts.cpp  ./core/app.h  ./core/image.h  ./core/plugindata.cpp  ./core/request.cpp  ./core/synchro.h  ./core/sessioncontainer.h  ./core/cookieparser.h  ./core/misc.cpp  ./core/error.h  ./core/item.cpp  ./core/timezone.h  ./core/compress.h  ./core/dirs.cpp  ./core/crypt.cpp  ./core/slog.cpp  ./core/config.cpp  ./core/users.h  ./core/lastcontainer.cpp  ./core/httpsimpleparser.cpp  ./core/postparser.h  ./core/threadmanager.h  ./core/pluginmsg.h  ./core/acceptbaseparser.h  ./core/loadavg.cpp  ./core/mountparser.cpp  ./core/job.h  ./core/timezones.h  ./core/sessionmanager.h  ./core/groups.h  ./core/system.cpp  ./core/rebus.h  ./core/synchro.cpp  ./core/lock.cpp  ./core/acceptencodingparser.h  ./core/version.h  ./core/compress.cpp  ./core/ipbancontainer.cpp  ./core/request.h  ./core/plugindata.h  ./core/plugin.cpp  ./core/sessionparser.cpp  ./core/sessionidmanager.h  ./core/bbcodeparser.h  ./c
Line truncated
+winix.src.files = ./templates/miscspace.h  ./templates/generic.cpp  ./templates/sys.cpp  ./templates/user.cpp  ./templates/currentdate.cpp  ./templates/textextstream.cpp  ./templates/upload.cpp  ./templates/patterncacher.h  ./templates/env.cpp  ./templates/indexpatterns.cpp  ./templates/htmltextstream.h  ./templates/who.cpp  ./templates/locale.cpp  ./templates/misc.h  ./templates/patterns.cpp  ./templates/passwd.cpp  ./templates/mount.cpp  ./templates/templates.h  ./templates/last.cpp  ./templates/uptime.cpp  ./templates/insert.cpp  ./templates/doc.cpp  ./templates/changepatterns.cpp  ./templates/server.cpp  ./templates/miscspace.cpp  ./templates/login.cpp  ./templates/filters.cpp  ./templates/localefilter.h  ./templates/man.cpp  ./templates/ls.cpp  ./templates/dir.cpp  ./templates/priv.cpp  ./templates/rebus.cpp  ./templates/patterncacher.cpp  ./templates/htmltextstream.cpp  ./templates/textextstream.h  ./templates/adduser.cpp  ./templates/ipban.cpp  ./templates/misc.cpp  ./templates/indexpatterns.h  ./templates/item.cpp  ./templates/templates.cpp  ./templates/winix.cpp  ./templates/slog.cpp  ./templates/locale.h  ./templates/patterns.h  ./templates/config.cpp  ./templates/localefilter.cpp  ./templates/changepatterns.h  ./templates/stat.cpp  ./templates/template.cpp  ./plugins/mailregister/funregistermail_showusers.h  ./plugins/mailregister/mdb.h  ./plugins/mailregister/registermail_info.h  ./plugins/mailregister/templates.cpp  ./plugins/mailregister/funregistermail.cpp  ./plugins/mailregister/funregistermail_showusers.cpp  ./plugins/mailregister/mdb.cpp  ./plugins/mailregister/registermail_info.cpp  ./plugins/mailregister/init.cpp  ./plugins/mailregister/funregistermail.h  ./plugins/thread/tdb.cpp  ./plugins/thread/pluginmsg.h  ./plugins/thread/thread.h  ./plugins/thread/tdb.h  ./plugins/thread/funthread.cpp  ./plugins/thread/threadinfo.cpp  ./plugins/thread/funthread.h  ./plugins/thread/threadinfo.h  ./plugins/thread/createthread.cpp  ./plugins/thread/reply.cpp  ./plugins/thread/showthreads.cpp  ./plugins/thread/templates.cpp  ./plugins/thread/createthread.h  ./plugins/thread/reply.h  ./plugins/thread/showthreads.h  ./plugins/thread/init.cpp  ./plugins/thread/templates.h  ./plugins/group/groupinfo.h  ./plugins/group/templates.cpp  ./plugins/group/groups.cpp  ./plugins/group/init.cpp  ./plugins/group/groups.h  ./plugins/group/groupinfo.cpp  ./plugins/stats/bot.cpp  ./plugins/stats/statssession.h  ./plugins/stats/bot.h  ./plugins/stats/stats.cpp  ./plugins/stats/templates.cpp  ./plugins/stats/init.cpp  ./plugins/stats/stats.h  ./plugins/stats/templates.h  ./plugins/gallery/gallery.h  ./plugins/gallery/galleryinfo.cpp  ./plugins/gallery/templates.cpp  ./plugins/gallery/gallery.cpp  ./plugins/gallery/galleryinfo.h  ./plugins/gallery/init.cpp  ./plugins/export/init.cpp  ./plugins/export/export.h  ./plugins/export/exportthread.cpp  ./plugins/export/message.h  ./plugins/export/edb.cpp  ./plugins/export/funexport.cpp  ./plugins/export/exportinfo.cpp  ./plugins/export/exportthread.h  ./plugins/export/edb.h  ./plugins/export/funexport.h  ./plugins/export/exportinfo.h  ./plugins/ticket/sessiondata.h  ./plugins/ticket/ticket.h  ./plugins/ticket/editticket.cpp  ./plugins/ticket/funticket.cpp  ./plugins/ticket/templates.cpp  ./plugins/ticket/editticket.h  ./plugins/ticket/ticketinfo.cpp  ./plugins/ticket/funticket.h  ./plugins/ticket/init.cpp  ./plugins/ticket/ticketinfo.h  ./plugins/ticket/createticket.cpp  ./plugins/ticket/showtickets.cpp  ./plugins/ticket/tdb.cpp  ./plugins/ticket/pluginmsg.h  ./plugins/ticket/showtickets.h  ./plugins/ticket/createticket.h  ./plugins/ticket/sessiondata.cpp  ./plugins/ticket/tdb.h  ./plugins/menu/cache.cpp  ./plugins/menu/init.cpp  ./plugins/menu/cache.h  ./plugins/menu/templates.cpp  ./main/main.cpp  ./db/dbbase.cpp  ./db/dbconn.cpp  ./db/db.cpp  ./db/dbbase.h  ./db/dbitemcolumns.cpp  ./db/dbtextstream.cpp  ./db/dbconn.h  ./db/db.h  ./db/dbitemcolumns.h  ./db/dbitemquery.cpp  ./db/dbtextstream.h  ./db/dbitemquery.h  ./core/loadavg.h  ./core/session.cpp  ./core/user.h  ./core/mountparser.h  ./core/mounts.cpp  ./core/app.h  ./core/image.h  ./core/plugindata.cpp  ./core/request.cpp  ./core/synchro.h  ./core/sessioncontainer.h  ./core/cookieparser.h  ./core/misc.cpp  ./core/error.h  ./core/item.cpp  ./core/timezone.h  ./core/compress.h  ./core/dirs.cpp  ./core/crypt.cpp  ./core/slog.cpp  ./core/config.cpp  ./core/users.h  ./core/lastcontainer.cpp  ./core/httpsimpleparser.cpp  ./core/postparser.h  ./core/threadmanager.h  ./core/pluginmsg.h  ./core/acceptbaseparser.h  ./core/loadavg.cpp  ./core/mountparser.cpp  ./core/job.h  ./core/timezones.h  ./core/sessionmanager.h  ./core/groups.h  ./core/system.cpp  ./core/rebus.h  ./core/synchro.cpp  ./core/lock.cpp  ./core/acceptencodingparser.h  ./core/version.h  ./core/compress.cpp  ./core/ipbancontainer.cpp  ./core/request.h  ./core/plugindata.h  ./core/plugin.cpp  ./core/sessionparser.cpp  ./core/sessionidmanager.h  ./core/bbcodeparser.h  ./c
Line truncated