From 2dd3fc7df8ca69743d49562e09da64a0d8d68a79 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 21 Apr 2009 20:50:55 +0000 Subject: [PATCH] changed: the way of building core.a content.a templates.a confparser.a have gone away there is only: cmslu.a now (in the global directory 'cmslu') changed: the way of building in Makefile(s) we dont longer use explicitly a variable 'o = file1.o file2.o...' it was put into Makefile.o.dep and is generated automatically when 'make depend' is invoked changed: some #include "..." directives were put from *.h to *.cpp files fewer dependences git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@501 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile | 33 ++-- app/content.h | 9 +- app/templates.h | 5 +- confparser/Makefile | 17 +- confparser/Makefile.o.dep | 1 + content/Makefile | 16 +- content/Makefile.dep | 347 ++++++++++++------------------------ content/Makefile.o.dep | 1 + content/cat.cpp | 10 +- content/content.cpp | 7 +- content/content.h | 15 +- content/createthread.cpp | 8 +- content/default.cpp | 6 +- content/emacs.cpp | 8 +- content/last.cpp | 8 +- content/login.cpp | 10 +- content/logout.cpp | 5 +- content/ls.cpp | 13 +- content/mkdir.cpp | 7 +- content/node.cpp | 4 +- content/priv.cpp | 8 +- content/rm.cpp | 7 +- content/run.cpp | 5 +- content/thread.cpp | 8 +- content/who.cpp | 3 +- core/Makefile | 14 +- core/Makefile.dep | 150 +++++++--------- core/Makefile.o.dep | 1 + core/config.cpp | 4 +- core/config.h | 15 +- core/cookieparser.h | 8 +- core/data.cpp | 4 +- core/data.h | 9 +- core/db.cpp | 4 +- core/db.h | 14 +- core/db_itemcolumns.cpp | 2 +- core/dircontainer.cpp | 4 +- core/dircontainer.h | 8 +- core/dirs.cpp | 6 +- core/dirs.h | 10 +- core/done.cpp | 2 +- core/done.h | 6 +- core/error.cpp | 2 +- core/error.h | 6 +- core/function.cpp | 3 +- core/function.h | 5 +- core/functioncodeparser.cpp | 4 +- core/functioncodeparser.h | 9 +- core/functionparser.cpp | 9 +- core/functionparser.h | 13 +- core/functions.cpp | 1 + core/functions.h | 8 +- core/getparser.h | 6 +- core/group.h | 6 +- core/groups.cpp | 5 +- core/groups.h | 8 +- core/httpsimpleparser.cpp | 2 +- core/httpsimpleparser.h | 6 +- core/item.h | 6 +- core/lastcontainer.cpp | 1 + core/lastcontainer.h | 5 +- core/log.cpp | 2 +- core/log.h | 6 +- core/main.cpp | 3 +- core/misc.cpp | 3 +- core/misc.h | 7 +- core/mount.h | 4 +- core/mountparser.cpp | 1 + core/mountparser.h | 8 +- core/mounts.cpp | 3 + core/mounts.h | 7 +- core/postparser.h | 6 +- core/request.cpp | 6 +- core/request.h | 15 +- core/requestcontroller.cpp | 7 +- core/requestcontroller.h | 13 +- core/requesttypes.h | 6 +- core/session.cpp | 3 +- core/session.h | 11 +- core/sessioncontainer.cpp | 4 +- core/sessioncontainer.h | 10 +- core/sessionmanager.cpp | 7 +- core/sessionmanager.h | 11 +- core/thread.h | 5 +- core/ugcontainer.h | 7 +- core/user.h | 8 +- core/users.cpp | 3 +- core/users.h | 7 +- templates/Makefile | 17 +- templates/Makefile.dep | 234 ++++++++++-------------- templates/Makefile.o.dep | 1 + templates/dir.cpp | 8 +- templates/doc.cpp | 6 +- templates/done.cpp | 5 +- templates/item.cpp | 7 +- templates/last.cpp | 6 +- templates/patterncacher.cpp | 5 +- templates/patterncacher.h | 9 +- templates/priv.cpp | 7 +- templates/sys.cpp | 7 +- templates/templates.cpp | 6 +- templates/templates.h | 20 +-- templates/thread.cpp | 6 +- templates/user.cpp | 7 +- templates/who.cpp | 5 +- 105 files changed, 647 insertions(+), 809 deletions(-) create mode 100755 confparser/Makefile.o.dep create mode 100755 content/Makefile.o.dep create mode 100755 core/Makefile.o.dep create mode 100755 templates/Makefile.o.dep diff --git a/Makefile b/Makefile index be70962..ab79f5a 100755 --- a/Makefile +++ b/Makefile @@ -1,36 +1,24 @@ # Makefile for GNU make -ifndef CC -CC = g++ -export CC +ifndef CXX +CXX = g++ +export CXX endif -ifndef CFLAGS -CFLAGS = -Wall -pedantic -g -I/usr/local/include -L/usr/local/lib -export CFLAGS +ifndef CXXFLAGS +CXXFLAGS = -Wall -pedantic -g -I/usr/local/include -L/usr/local/lib +export CXXFLAGS endif +all: cmslu.a -all: core content confparser templates - cp core/core.a ./ - cp content/content.a ./ - cp confparser/confparser.a ./ - cp templates/templates.a ./ - - -core: FORCE +cmslu.a: FORCE @cd core ; $(MAKE) -e - -content: FORCE @cd content ; $(MAKE) -e - -confparser: FORCE @cd confparser ; $(MAKE) -e - -templates: FORCE @cd templates ; $(MAKE) -e - + ar rcs cmslu.a core/*.o content/*.o templates/*.o confparser/*.o clean: @@ -38,13 +26,12 @@ clean: @cd content ; $(MAKE) -e clean @cd confparser ; $(MAKE) -e clean @cd templates ; $(MAKE) -e clean - rm -f *.a + rm -f cmslu.a FORCE: - depend: @cd core ; $(MAKE) -e depend @cd content ; $(MAKE) -e depend diff --git a/app/content.h b/app/content.h index 1c11f9e..fd04051 100755 --- a/app/content.h +++ b/app/content.h @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -11,13 +11,6 @@ #define headerfileappcontent -#include "../core/log.h" -#include "../core/data.h" -#include "../core/function.h" -#include "../core/log.h" - - - namespace AppContent { diff --git a/app/templates.h b/app/templates.h index 77fe669..5c4eb1c 100755 --- a/app/templates.h +++ b/app/templates.h @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -12,8 +12,7 @@ #include "../../ezc/src/ezc.h" -#include "../core/log.h" -#include "../core/data.h" + namespace AppTemplateFunctions { diff --git a/confparser/Makefile b/confparser/Makefile index 858e5f4..d3c825d 100755 --- a/confparser/Makefile +++ b/confparser/Makefile @@ -1,29 +1,22 @@ -o = confparser.o +include Makefile.o.dep - -all: confparser.a - - -confparser.a: $(o) - ar rcs confparser.a $(o) +all: $(o) .SUFFIXES: .cpp .o .cpp.o: - $(CC) -c $(CFLAGS) $< + $(CXX) -c $(CXXFLAGS) $< depend: makedepend $(DEPMACROS) -Y. -f- *.cpp > Makefile.dep - + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep clean: rm -f *.o - rm -f *.a - include Makefile.dep - diff --git a/confparser/Makefile.o.dep b/confparser/Makefile.o.dep new file mode 100755 index 0000000..b91d287 --- /dev/null +++ b/confparser/Makefile.o.dep @@ -0,0 +1 @@ +o = confparser.o diff --git a/content/Makefile b/content/Makefile index f4dd33a..d3c825d 100755 --- a/content/Makefile +++ b/content/Makefile @@ -1,26 +1,22 @@ -o = content.o priv.o emacs.o login.o rm.o cat.o logout.o ls.o node.o mkdir.o default.o run.o last.o who.o thread.o createthread.o +include Makefile.o.dep -all: content.a - -content.a: $(o) - ar rcs content.a $(o) +all: $(o) .SUFFIXES: .cpp .o .cpp.o: - $(CC) -c $(CFLAGS) $< + $(CXX) -c $(CXXFLAGS) $< + depend: makedepend $(DEPMACROS) -Y. -f- *.cpp > Makefile.dep - + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep clean: rm -f *.o - rm -f *.a - - include Makefile.dep diff --git a/content/Makefile.dep b/content/Makefile.dep index e01dc37..7cc6c5a 100755 --- a/content/Makefile.dep +++ b/content/Makefile.dep @@ -1,241 +1,120 @@ # DO NOT DELETE -cat.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -cat.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -cat.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -cat.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h ../core/users.h -cat.o: ../core/groups.h ../core/functions.h ../core/function.h -cat.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -cat.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -cat.o: ../core/session.h ../core/done.h ../core/getparser.h -cat.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -cat.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -cat.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -cat.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -cat.o: ../app/templates.h ../core/misc.h ../core/function.h -cat.o: ../core/functionparser.h ../core/data.h ../app/content.h -content.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -content.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -content.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -content.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -content.o: ../core/thread.h ../core/users.h ../core/groups.h -content.o: ../core/functions.h ../core/function.h -content.o: ../core/functioncodeparser.h ../core/lastcontainer.h -content.o: ../core/mounts.h ../core/mount.h ../core/request.h -content.o: ../core/requesttypes.h ../core/session.h ../core/done.h -content.o: ../core/getparser.h ../core/httpsimpleparser.h -content.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -content.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -content.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -content.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -content.o: ../core/misc.h ../core/function.h ../core/functionparser.h -content.o: ../core/data.h ../app/content.h -createthread.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -createthread.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -createthread.o: ../core/error.h ../core/dirs.h ../core/db.h -createthread.o: ../core/dircontainer.h ../core/user.h ../core/group.h -createthread.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -createthread.o: ../core/groups.h ../core/functions.h ../core/function.h -createthread.o: ../core/functioncodeparser.h ../core/lastcontainer.h -createthread.o: ../core/mounts.h ../core/mount.h ../core/request.h -createthread.o: ../core/requesttypes.h ../core/session.h ../core/done.h -createthread.o: ../core/getparser.h ../core/httpsimpleparser.h -createthread.o: ../core/postparser.h ../core/cookieparser.h -createthread.o: ../core/mountparser.h ../core/request.h ../core/item.h -createthread.o: ../core/db.h ../core/error.h ../core/user.h ../core/group.h -createthread.o: ../core/users.h ../core/groups.h ../core/log.h -createthread.o: ../templates/patterncacher.h ../app/templates.h -createthread.o: ../core/misc.h ../core/function.h ../core/functionparser.h -createthread.o: ../core/data.h ../app/content.h -default.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -default.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -default.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -default.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -default.o: ../core/thread.h ../core/users.h ../core/groups.h -default.o: ../core/functions.h ../core/function.h -default.o: ../core/functioncodeparser.h ../core/lastcontainer.h -default.o: ../core/mounts.h ../core/mount.h ../core/request.h -default.o: ../core/requesttypes.h ../core/session.h ../core/done.h -default.o: ../core/getparser.h ../core/httpsimpleparser.h -default.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -default.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -default.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -default.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -default.o: ../core/misc.h ../core/function.h ../core/functionparser.h -default.o: ../core/data.h ../app/content.h -emacs.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -emacs.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -emacs.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -emacs.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -emacs.o: ../core/thread.h ../core/users.h ../core/groups.h -emacs.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h -emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +cat.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +cat.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +cat.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h +cat.o: ../core/error.h ../core/log.h ../core/user.h ../core/function.h +cat.o: ../core/thread.h ../core/error.h +content.o: content.h ../core/item.h ../templates/templates.h +content.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +content.o: ../app/templates.h ../core/request.h ../core/requesttypes.h +content.o: ../core/session.h ../core/done.h ../core/item.h ../core/error.h +content.o: ../core/log.h ../core/user.h ../core/function.h ../core/thread.h +content.o: ../core/error.h ../core/db.h ../core/group.h +content.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/data.h +content.o: ../core/dirs.h ../core/users.h ../core/groups.h +content.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +content.o: ../core/mount.h +createthread.o: content.h ../core/item.h ../templates/templates.h +createthread.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +createthread.o: ../app/templates.h ../core/request.h ../core/requesttypes.h +createthread.o: ../core/session.h ../core/done.h ../core/item.h +createthread.o: ../core/error.h ../core/log.h ../core/user.h +createthread.o: ../core/function.h ../core/thread.h ../core/error.h +createthread.o: ../core/db.h ../core/group.h ../core/dircontainer.h +createthread.o: ../core/ugcontainer.h ../core/mount.h ../core/data.h +createthread.o: ../core/dirs.h ../core/users.h ../core/groups.h +createthread.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +createthread.o: ../core/mount.h +default.o: content.h ../core/item.h ../templates/templates.h +default.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +default.o: ../app/templates.h ../core/request.h ../core/requesttypes.h +default.o: ../core/session.h ../core/done.h ../core/item.h ../core/error.h +default.o: ../core/log.h ../core/user.h ../core/function.h ../core/thread.h +default.o: ../core/error.h ../core/db.h ../core/group.h +default.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/data.h +default.o: ../core/dirs.h ../core/users.h ../core/groups.h +default.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +default.o: ../core/mount.h +emacs.o: content.h ../core/item.h ../templates/templates.h +emacs.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../app/templates.h emacs.o: ../core/request.h ../core/requesttypes.h ../core/session.h -emacs.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -emacs.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -emacs.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -emacs.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -emacs.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -emacs.o: ../core/misc.h ../core/function.h ../core/functionparser.h -emacs.o: ../core/data.h ../app/content.h -last.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -last.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -last.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -last.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h -last.o: ../core/users.h ../core/groups.h ../core/functions.h -last.o: ../core/function.h ../core/functioncodeparser.h -last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -last.o: ../core/request.h ../core/requesttypes.h ../core/session.h -last.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -last.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -last.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -last.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -last.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -last.o: ../core/misc.h ../core/function.h ../core/functionparser.h -last.o: ../core/data.h ../app/content.h -login.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -login.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -login.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -login.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -login.o: ../core/thread.h ../core/users.h ../core/groups.h -login.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h -login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +emacs.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +emacs.o: ../core/user.h ../core/function.h ../core/thread.h ../core/error.h +emacs.o: ../core/misc.h ../core/db.h ../core/group.h ../core/dircontainer.h +emacs.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h +emacs.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h +emacs.o: ../core/mounts.h ../core/mount.h +last.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +last.o: ../templates/patterncacher.h ../app/templates.h +login.o: content.h ../core/item.h ../templates/templates.h +login.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../app/templates.h login.o: ../core/request.h ../core/requesttypes.h ../core/session.h -login.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -login.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -login.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -login.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -login.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -login.o: ../core/misc.h ../core/function.h ../core/functionparser.h -login.o: ../core/data.h ../app/content.h -logout.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -logout.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -logout.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -logout.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -logout.o: ../core/thread.h ../core/users.h ../core/groups.h -logout.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h -logout.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +login.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +login.o: ../core/user.h ../core/function.h ../core/thread.h ../core/error.h +login.o: ../core/db.h ../core/group.h ../core/dircontainer.h +login.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h +login.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h +login.o: ../core/mounts.h ../core/mount.h +logout.o: content.h ../core/item.h ../templates/templates.h +logout.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../app/templates.h logout.o: ../core/request.h ../core/requesttypes.h ../core/session.h -logout.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -logout.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -logout.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -logout.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -logout.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -logout.o: ../core/misc.h ../core/function.h ../core/functionparser.h -logout.o: ../core/data.h ../app/content.h -ls.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -ls.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -ls.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -ls.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h ../core/users.h -ls.o: ../core/groups.h ../core/functions.h ../core/function.h -ls.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -ls.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -ls.o: ../core/session.h ../core/done.h ../core/getparser.h -ls.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -ls.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -ls.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -ls.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -ls.o: ../app/templates.h ../core/misc.h ../core/function.h -ls.o: ../core/functionparser.h ../core/data.h ../app/content.h -mkdir.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -mkdir.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -mkdir.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -mkdir.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -mkdir.o: ../core/thread.h ../core/users.h ../core/groups.h -mkdir.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h -mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +logout.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +logout.o: ../core/user.h ../core/function.h ../core/thread.h ../core/data.h +logout.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h +logout.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h +logout.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +logout.o: ../core/mount.h +ls.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +ls.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +ls.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h +ls.o: ../core/error.h ../core/log.h ../core/user.h ../core/function.h +ls.o: ../core/thread.h ../core/db.h ../core/group.h ../core/dircontainer.h +ls.o: ../core/ugcontainer.h +mkdir.o: content.h ../core/item.h ../templates/templates.h +mkdir.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../app/templates.h mkdir.o: ../core/request.h ../core/requesttypes.h ../core/session.h -mkdir.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -mkdir.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -mkdir.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -mkdir.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -mkdir.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -mkdir.o: ../core/misc.h ../core/function.h ../core/functionparser.h -mkdir.o: ../core/data.h ../app/content.h -node.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -node.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -node.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -node.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h -node.o: ../core/users.h ../core/groups.h ../core/functions.h -node.o: ../core/function.h ../core/functioncodeparser.h -node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -node.o: ../core/request.h ../core/requesttypes.h ../core/session.h -node.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -node.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -node.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -node.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -node.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -node.o: ../core/misc.h ../core/function.h ../core/functionparser.h -node.o: ../core/data.h ../app/content.h -priv.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -priv.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -priv.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -priv.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h -priv.o: ../core/users.h ../core/groups.h ../core/functions.h -priv.o: ../core/function.h ../core/functioncodeparser.h -priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h -priv.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -priv.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -priv.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -priv.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -priv.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -priv.o: ../core/misc.h ../core/function.h ../core/functionparser.h -priv.o: ../core/data.h ../app/content.h -rm.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -rm.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -rm.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -rm.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h ../core/users.h -rm.o: ../core/groups.h ../core/functions.h ../core/function.h -rm.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -rm.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -rm.o: ../core/session.h ../core/done.h ../core/getparser.h -rm.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -rm.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -rm.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -rm.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -rm.o: ../app/templates.h ../core/misc.h ../core/function.h -rm.o: ../core/functionparser.h ../core/data.h ../app/content.h -run.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -run.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -run.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -run.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h ../core/users.h -run.o: ../core/groups.h ../core/functions.h ../core/function.h -run.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -run.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -run.o: ../core/session.h ../core/done.h ../core/getparser.h -run.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -run.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -run.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -run.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -run.o: ../app/templates.h ../core/misc.h ../core/function.h -run.o: ../core/functionparser.h ../core/data.h ../app/content.h -thread.o: content.h ../templates/templates.h ../../ezc/src/ezc.h -thread.o: ../core/data.h ../core/misc.h ../core/log.h ../core/item.h -thread.o: ../core/error.h ../core/dirs.h ../core/db.h ../core/dircontainer.h -thread.o: ../core/user.h ../core/group.h ../core/ugcontainer.h -thread.o: ../core/thread.h ../core/users.h ../core/groups.h -thread.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h -thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +mkdir.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +mkdir.o: ../core/user.h ../core/function.h ../core/thread.h ../core/error.h +mkdir.o: ../core/db.h ../core/group.h ../core/dircontainer.h +mkdir.o: ../core/ugcontainer.h ../core/data.h ../core/dirs.h ../core/users.h +mkdir.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h +mkdir.o: ../core/mounts.h ../core/mount.h +node.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +node.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +node.o: ../core/requesttypes.h ../core/session.h ../core/done.h +node.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h +node.o: ../core/function.h ../core/thread.h +priv.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +priv.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h +priv.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h +priv.o: ../core/function.h ../core/thread.h ../core/error.h ../core/db.h +priv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +priv.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h +priv.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +priv.o: ../core/mount.h +rm.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +rm.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +rm.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h +rm.o: ../core/error.h ../core/log.h ../core/user.h ../core/function.h +rm.o: ../core/thread.h ../core/error.h ../core/db.h ../core/group.h +rm.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/data.h +rm.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h +rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +run.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +run.o: ../templates/patterncacher.h ../app/templates.h ../core/request.h +run.o: ../core/requesttypes.h ../core/session.h ../core/done.h ../core/item.h +run.o: ../core/error.h ../core/log.h ../core/user.h ../core/function.h +run.o: ../core/thread.h ../core/error.h +thread.o: content.h ../core/item.h ../templates/templates.h +thread.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../app/templates.h thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h -thread.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -thread.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h -thread.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h -thread.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h -thread.o: ../core/log.h ../templates/patterncacher.h ../app/templates.h -thread.o: ../core/misc.h ../core/function.h ../core/functionparser.h -thread.o: ../core/data.h ../app/content.h -who.o: content.h ../templates/templates.h ../../ezc/src/ezc.h ../core/data.h -who.o: ../core/misc.h ../core/log.h ../core/item.h ../core/error.h -who.o: ../core/dirs.h ../core/db.h ../core/dircontainer.h ../core/user.h -who.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h ../core/users.h -who.o: ../core/groups.h ../core/functions.h ../core/function.h -who.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -who.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -who.o: ../core/session.h ../core/done.h ../core/getparser.h -who.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -who.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -who.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -who.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -who.o: ../app/templates.h ../core/misc.h ../core/function.h -who.o: ../core/functionparser.h ../core/data.h ../app/content.h +thread.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +thread.o: ../core/user.h ../core/function.h ../core/thread.h ../core/db.h +thread.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +thread.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h +thread.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +thread.o: ../core/mount.h ../core/mount.h +who.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h +who.o: ../templates/patterncacher.h ../app/templates.h diff --git a/content/Makefile.o.dep b/content/Makefile.o.dep new file mode 100755 index 0000000..536c090 --- /dev/null +++ b/content/Makefile.o.dep @@ -0,0 +1 @@ +o = cat.o content.o createthread.o default.o emacs.o last.o login.o logout.o ls.o mkdir.o node.o priv.o rm.o run.o thread.o who.o diff --git a/content/cat.cpp b/content/cat.cpp index 1e24759..62efb4d 100755 --- a/content/cat.cpp +++ b/content/cat.cpp @@ -2,18 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" - - - - - - +#include "../core/request.h" +#include "../core/error.h" diff --git a/content/content.cpp b/content/content.cpp index c7b5453..3300cd1 100755 --- a/content/content.cpp +++ b/content/content.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" + diff --git a/content/content.h b/content/content.h index ecb3b31..5278714 100755 --- a/content/content.h +++ b/content/content.h @@ -2,27 +2,20 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilecontent -#define headerfilecontent +#ifndef headerfilecmslucontentcontent +#define headerfilecmslucontentcontent #include #include #include +#include "../core/item.h" #include "../templates/templates.h" -#include "../core/request.h" -#include "../core/error.h" -#include "../core/misc.h" -#include "../core/db.h" -#include "../core/user.h" -#include "../core/function.h" -#include "../core/functionparser.h" - class Content diff --git a/content/createthread.cpp b/content/createthread.cpp index c9376df..4fb9ea3 100755 --- a/content/createthread.cpp +++ b/content/createthread.cpp @@ -2,13 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" -#include "../app/content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/mount.h" +#include "../core/data.h" diff --git a/content/default.cpp b/content/default.cpp index 1d89acc..2e1fe97 100755 --- a/content/default.cpp +++ b/content/default.cpp @@ -2,12 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" diff --git a/content/emacs.cpp b/content/emacs.cpp index e1c8ca0..65beb5d 100755 --- a/content/emacs.cpp +++ b/content/emacs.cpp @@ -2,12 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/misc.h" +#include "../core/db.h" +#include "../core/data.h" + diff --git a/content/last.cpp b/content/last.cpp index ecb6576..9314316 100755 --- a/content/last.cpp +++ b/content/last.cpp @@ -2,18 +2,12 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" -#include "../app/content.h" - - - - - diff --git a/content/login.cpp b/content/login.cpp index 3ea96e4..cd2fb93 100755 --- a/content/login.cpp +++ b/content/login.cpp @@ -2,14 +2,20 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#include "content.h" #include +#include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" + + /* void Content::PostFunLoginAddLast() diff --git a/content/logout.cpp b/content/logout.cpp index af1e7f2..bc8ab57 100755 --- a/content/logout.cpp +++ b/content/logout.cpp @@ -2,12 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/data.h" + diff --git a/content/ls.cpp b/content/ls.cpp index afe0e89..0b8681b 100755 --- a/content/ls.cpp +++ b/content/ls.cpp @@ -2,21 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" - - - - - - - - - +#include "../core/request.h" +#include "../core/db.h" diff --git a/content/mkdir.cpp b/content/mkdir.cpp index 8bb99ee..69ee21f 100755 --- a/content/mkdir.cpp +++ b/content/mkdir.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" + diff --git a/content/node.cpp b/content/node.cpp index b07e8dd..4b2efa8 100755 --- a/content/node.cpp +++ b/content/node.cpp @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" - +#include "../core/request.h" diff --git a/content/priv.cpp b/content/priv.cpp index 97d97c6..f6c8a0a 100755 --- a/content/priv.cpp +++ b/content/priv.cpp @@ -2,12 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" + + diff --git a/content/rm.cpp b/content/rm.cpp index edc27f7..0f1ed0f 100755 --- a/content/rm.cpp +++ b/content/rm.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" +#include "../core/request.h" +#include "../core/error.h" +#include "../core/db.h" +#include "../core/data.h" + void Content::FunRmDirRecursive() diff --git a/content/run.cpp b/content/run.cpp index 851d20f..cb1eb09 100755 --- a/content/run.cpp +++ b/content/run.cpp @@ -2,13 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" -#include "../app/content.h" +#include "../core/request.h" +#include "../core/error.h" diff --git a/content/thread.cpp b/content/thread.cpp index 6b2a840..6ec6abb 100755 --- a/content/thread.cpp +++ b/content/thread.cpp @@ -2,14 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" -#include "../app/content.h" - +#include "../core/request.h" +#include "../core/db.h" +#include "../core/data.h" +#include "../core/mount.h" diff --git a/content/who.cpp b/content/who.cpp index 6d2ebfe..dbada4d 100755 --- a/content/who.cpp +++ b/content/who.cpp @@ -2,13 +2,12 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "content.h" -#include "../app/content.h" diff --git a/core/Makefile b/core/Makefile index 47b7812..d3c825d 100755 --- a/core/Makefile +++ b/core/Makefile @@ -1,26 +1,22 @@ -o = data.o log.o sessionmanager.o requestcontroller.o dircontainer.o session.o main.o done.o request.o misc.o httpsimpleparser.o db.o error.o db_itemcolumns.o users.o config.o dirs.o groups.o function.o functionparser.o functions.o functioncodeparser.o sessioncontainer.o lastcontainer.o mounts.o mountparser.o mount.o +include Makefile.o.dep +all: $(o) -all: core.a - -core.a: $(o) - ar rcs core.a $(o) .SUFFIXES: .cpp .o .cpp.o: - $(CC) -c $(CFLAGS) $< + $(CXX) -c $(CXXFLAGS) $< depend: makedepend $(DEPMACROS) -Y. -f- *.cpp > Makefile.dep - + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep clean: rm -f *.o - rm -f *.a - include Makefile.dep diff --git a/core/Makefile.dep b/core/Makefile.dep index ad77777..0421a3e 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -1,98 +1,72 @@ # DO NOT DELETE -config.o: config.h ../confparser/confparser.h error.h log.h data.h misc.h -config.o: item.h dirs.h db.h dircontainer.h user.h group.h ugcontainer.h -config.o: thread.h users.h groups.h functions.h function.h -config.o: functioncodeparser.h lastcontainer.h mounts.h mount.h request.h -config.o: requesttypes.h session.h done.h getparser.h httpsimpleparser.h -config.o: postparser.h cookieparser.h mountparser.h -data.o: data.h misc.h log.h item.h error.h dirs.h db.h dircontainer.h user.h -data.o: group.h ugcontainer.h thread.h users.h groups.h functions.h -data.o: function.h functioncodeparser.h lastcontainer.h mounts.h mount.h -data.o: request.h requesttypes.h session.h done.h getparser.h -data.o: httpsimpleparser.h postparser.h cookieparser.h mountparser.h -db.o: db.h log.h item.h misc.h error.h dircontainer.h user.h group.h -db.o: ugcontainer.h thread.h -db_itemcolumns.o: db.h log.h item.h misc.h error.h dircontainer.h user.h -db_itemcolumns.o: group.h ugcontainer.h thread.h +config.o: config.h ../confparser/confparser.h log.h data.h dirs.h item.h +config.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h +config.o: functions.h function.h lastcontainer.h mounts.h mount.h +data.o: data.h dirs.h item.h dircontainer.h users.h user.h ugcontainer.h +data.o: log.h groups.h group.h functions.h function.h lastcontainer.h +data.o: mounts.h mount.h +db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h +db.o: ugcontainer.h misc.h +db_itemcolumns.o: db.h item.h user.h group.h thread.h error.h log.h +db_itemcolumns.o: dircontainer.h ugcontainer.h dircontainer.o: dircontainer.h item.h log.h -dirs.o: dirs.h item.h error.h log.h db.h misc.h dircontainer.h user.h group.h -dirs.o: ugcontainer.h thread.h +dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h +dirs.o: thread.h ugcontainer.h done.o: done.h error.o: error.h log.h -function.o: function.h log.h item.h -functioncodeparser.o: functioncodeparser.h function.h log.h item.h -functionparser.o: functionparser.h request.h requesttypes.h log.h session.h -functionparser.o: error.h item.h done.h user.h getparser.h httpsimpleparser.h -functionparser.o: postparser.h cookieparser.h function.h thread.h data.h -functionparser.o: misc.h dirs.h db.h dircontainer.h group.h ugcontainer.h -functionparser.o: users.h groups.h functions.h functioncodeparser.h -functionparser.o: lastcontainer.h mounts.h mount.h mountparser.h -functionparser.o: ../app/content.h ../core/log.h ../core/data.h -functionparser.o: ../core/function.h -functions.o: functions.h function.h log.h item.h functioncodeparser.h -groups.o: groups.h group.h db.h log.h item.h misc.h error.h dircontainer.h -groups.o: user.h ugcontainer.h thread.h +function.o: function.h item.h +functioncodeparser.o: functioncodeparser.h item.h function.h log.h +functionparser.o: functionparser.h requesttypes.h ../app/content.h log.h +functionparser.o: item.h error.h data.h dirs.h dircontainer.h users.h user.h +functionparser.o: ugcontainer.h groups.h group.h functions.h function.h +functionparser.o: lastcontainer.h mounts.h mount.h db.h thread.h request.h +functionparser.o: session.h done.h +functions.o: functions.h function.h item.h +groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h +groups.o: error.h dircontainer.h httpsimpleparser.o: httpsimpleparser.h lastcontainer.o: lastcontainer.h log.h log.o: log.h -main.o: requestcontroller.h data.h misc.h log.h item.h error.h dirs.h db.h -main.o: dircontainer.h user.h group.h ugcontainer.h thread.h users.h groups.h -main.o: functions.h function.h functioncodeparser.h lastcontainer.h mounts.h -main.o: mount.h request.h requesttypes.h session.h done.h getparser.h -main.o: httpsimpleparser.h postparser.h cookieparser.h mountparser.h -main.o: ../content/content.h ../templates/templates.h ../../ezc/src/ezc.h -main.o: ../core/data.h ../core/request.h ../core/item.h ../core/db.h -main.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -main.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h -main.o: ../app/templates.h ../core/misc.h ../core/function.h -main.o: ../core/functionparser.h ../app/content.h sessionmanager.h -main.o: sessioncontainer.h config.h ../confparser/confparser.h -misc.o: misc.h log.h item.h +main.o: requestcontroller.h ../content/content.h ../core/item.h +main.o: ../templates/templates.h ../../ezc/src/ezc.h +main.o: ../templates/patterncacher.h ../app/templates.h sessionmanager.h +main.o: sessioncontainer.h session.h done.h item.h error.h log.h user.h +main.o: functionparser.h requesttypes.h ../app/content.h data.h dirs.h +main.o: dircontainer.h users.h ugcontainer.h groups.h group.h functions.h +main.o: function.h lastcontainer.h mounts.h mount.h request.h thread.h db.h +main.o: config.h ../confparser/confparser.h +misc.o: misc.h item.h log.h mount.o: mount.h -mountparser.o: mountparser.h log.h mount.h error.h item.h data.h misc.h -mountparser.o: dirs.h db.h dircontainer.h user.h group.h ugcontainer.h -mountparser.o: thread.h users.h groups.h functions.h function.h -mountparser.o: functioncodeparser.h lastcontainer.h mounts.h request.h -mountparser.o: requesttypes.h session.h done.h getparser.h httpsimpleparser.h -mountparser.o: postparser.h cookieparser.h -mounts.o: mounts.h mount.h request.h requesttypes.h log.h session.h error.h -mounts.o: item.h done.h user.h getparser.h httpsimpleparser.h postparser.h -mounts.o: cookieparser.h function.h thread.h mountparser.h data.h misc.h -mounts.o: dirs.h db.h dircontainer.h group.h ugcontainer.h users.h groups.h -mounts.o: functions.h functioncodeparser.h lastcontainer.h -request.o: request.h requesttypes.h log.h session.h error.h item.h done.h -request.o: user.h getparser.h httpsimpleparser.h postparser.h cookieparser.h -request.o: function.h thread.h -requestcontroller.o: requestcontroller.h data.h misc.h log.h item.h error.h -requestcontroller.o: dirs.h db.h dircontainer.h user.h group.h ugcontainer.h -requestcontroller.o: thread.h users.h groups.h functions.h function.h -requestcontroller.o: functioncodeparser.h lastcontainer.h mounts.h mount.h -requestcontroller.o: request.h requesttypes.h session.h done.h getparser.h -requestcontroller.o: httpsimpleparser.h postparser.h cookieparser.h -requestcontroller.o: mountparser.h ../content/content.h +mountparser.o: mountparser.h mount.h item.h error.h log.h data.h dirs.h +mountparser.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h +mountparser.o: functions.h function.h lastcontainer.h mounts.h +mounts.o: mounts.h mount.h data.h dirs.h item.h dircontainer.h users.h user.h +mounts.o: ugcontainer.h log.h groups.h group.h functions.h function.h +mounts.o: lastcontainer.h request.h requesttypes.h session.h done.h error.h +mounts.o: thread.h mountparser.h +request.o: request.h requesttypes.h session.h done.h item.h error.h log.h +request.o: user.h function.h thread.h getparser.h httpsimpleparser.h +request.o: postparser.h cookieparser.h +requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h requestcontroller.o: ../templates/templates.h ../../ezc/src/ezc.h -requestcontroller.o: ../core/data.h ../core/request.h ../core/item.h -requestcontroller.o: ../core/db.h ../core/error.h ../core/user.h -requestcontroller.o: ../core/group.h ../core/users.h ../core/groups.h -requestcontroller.o: ../core/log.h ../templates/patterncacher.h -requestcontroller.o: ../app/templates.h ../core/misc.h ../core/function.h -requestcontroller.o: ../core/functionparser.h ../app/content.h -requestcontroller.o: sessionmanager.h sessioncontainer.h -session.o: session.h requesttypes.h error.h log.h item.h done.h user.h -sessioncontainer.o: sessioncontainer.h session.h requesttypes.h error.h log.h -sessioncontainer.o: item.h done.h user.h data.h misc.h dirs.h db.h -sessioncontainer.o: dircontainer.h group.h ugcontainer.h thread.h users.h -sessioncontainer.o: groups.h functions.h function.h functioncodeparser.h -sessioncontainer.o: lastcontainer.h mounts.h mount.h request.h getparser.h -sessioncontainer.o: httpsimpleparser.h postparser.h cookieparser.h -sessioncontainer.o: mountparser.h -sessionmanager.o: sessionmanager.h request.h requesttypes.h log.h session.h -sessionmanager.o: error.h item.h done.h user.h getparser.h httpsimpleparser.h -sessionmanager.o: postparser.h cookieparser.h function.h thread.h data.h -sessionmanager.o: misc.h dirs.h db.h dircontainer.h group.h ugcontainer.h -sessionmanager.o: users.h groups.h functions.h functioncodeparser.h -sessionmanager.o: lastcontainer.h mounts.h mount.h mountparser.h -sessionmanager.o: sessioncontainer.h -users.o: users.h user.h db.h log.h item.h misc.h error.h dircontainer.h -users.o: group.h ugcontainer.h thread.h +requestcontroller.o: ../templates/patterncacher.h ../app/templates.h +requestcontroller.o: sessionmanager.h sessioncontainer.h session.h done.h +requestcontroller.o: item.h error.h log.h user.h functionparser.h +requestcontroller.o: requesttypes.h ../app/content.h data.h dirs.h +requestcontroller.o: dircontainer.h users.h ugcontainer.h groups.h group.h +requestcontroller.o: functions.h function.h lastcontainer.h mounts.h mount.h +requestcontroller.o: request.h thread.h postparser.h httpsimpleparser.h +requestcontroller.o: cookieparser.h +session.o: session.h done.h item.h error.h log.h user.h +sessioncontainer.o: sessioncontainer.h session.h done.h item.h error.h log.h +sessioncontainer.o: user.h data.h dirs.h dircontainer.h users.h ugcontainer.h +sessioncontainer.o: groups.h group.h functions.h function.h lastcontainer.h +sessioncontainer.o: mounts.h mount.h +sessionmanager.o: sessionmanager.h sessioncontainer.h session.h done.h item.h +sessionmanager.o: error.h log.h user.h request.h requesttypes.h function.h +sessionmanager.o: thread.h data.h dirs.h dircontainer.h users.h ugcontainer.h +sessionmanager.o: groups.h group.h functions.h lastcontainer.h mounts.h +sessionmanager.o: mount.h +users.o: users.h user.h ugcontainer.h log.h db.h item.h group.h thread.h +users.o: error.h dircontainer.h diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep new file mode 100755 index 0000000..e5615b3 --- /dev/null +++ b/core/Makefile.o.dep @@ -0,0 +1 @@ +o = config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o done.o error.o function.o functioncodeparser.o functionparser.o functions.o groups.o httpsimpleparser.o lastcontainer.o log.o main.o misc.o mount.o mountparser.o mounts.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o users.o diff --git a/core/config.cpp b/core/config.cpp index 80fd44f..3c69177 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -2,12 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "config.h" +#include "log.h" +#include "data.h" Config::Config() diff --git a/core/config.h b/core/config.h index 2e3fe28..7f560fe 100755 --- a/core/config.h +++ b/core/config.h @@ -2,22 +2,19 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileconfig -#define headerfileconfig - - -#include "../confparser/confparser.h" -#include "error.h" -#include "data.h" -#include "log.h" +#ifndef headerfilecmslucoreconfig +#define headerfilecmslucoreconfig #include +#include "../confparser/confparser.h" + + class Config { diff --git a/core/cookieparser.h b/core/cookieparser.h index 4f85ecc..f9ee8fc 100755 --- a/core/cookieparser.h +++ b/core/cookieparser.h @@ -2,18 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilecookieparser -#define headerfilecookieparser +#ifndef headerfilecmslucorecookieparser +#define headerfilecmslucorecookieparser #include #include "httpsimpleparser.h" #include "requesttypes.h" - +#include "log.h" diff --git a/core/data.cpp b/core/data.cpp index 01eaaf4..10ba1b9 100755 --- a/core/data.cpp +++ b/core/data.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ + + Data::Data() { signal_hup = false; diff --git a/core/data.h b/core/data.h index 8f7d826..1c521c1 100755 --- a/core/data.h +++ b/core/data.h @@ -2,22 +2,19 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfiledata -#define headerfiledata +#ifndef headerfilecmslucoredata +#define headerfilecmslucoredata #include #include #include #include -#include "misc.h" -#include "item.h" -#include "error.h" #include "dirs.h" #include "users.h" #include "groups.h" diff --git a/core/db.cpp b/core/db.cpp index d1b7b01..4f2605d 100755 --- a/core/db.cpp +++ b/core/db.cpp @@ -2,12 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "db.h" +#include "log.h" +#include "misc.h" Db::Db(bool close_at_end_) diff --git a/core/db.h b/core/db.h index 56b8088..cf32fa1 100755 --- a/core/db.h +++ b/core/db.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilecoredb -#define headerfilecoredb +#ifndef headerfilecmslucoredb +#define headerfilecmslucoredb #include @@ -20,15 +20,13 @@ #include #include -#include "log.h" #include "item.h" -#include "misc.h" -#include "error.h" -#include "dircontainer.h" #include "user.h" #include "group.h" -#include "ugcontainer.h" #include "thread.h" +#include "error.h" +#include "dircontainer.h" +#include "ugcontainer.h" diff --git a/core/db_itemcolumns.cpp b/core/db_itemcolumns.cpp index 24f0358..60aa567 100755 --- a/core/db_itemcolumns.cpp +++ b/core/db_itemcolumns.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ diff --git a/core/dircontainer.cpp b/core/dircontainer.cpp index 12a3b9b..0229b55 100755 --- a/core/dircontainer.cpp +++ b/core/dircontainer.cpp @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "dircontainer.h" - +#include "log.h" DirContainer::DirContainer() diff --git a/core/dircontainer.h b/core/dircontainer.h index 2a7384f..c44f2de 100755 --- a/core/dircontainer.h +++ b/core/dircontainer.h @@ -2,18 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfiledircontainer -#define headerfiledircontainer +#ifndef headerfilecmslucoredircontainer +#define headerfilecmslucoredircontainer #include #include #include "item.h" -#include "log.h" + class DirContainer diff --git a/core/dirs.cpp b/core/dirs.cpp index a4da5a3..998fe1b 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -2,12 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "dirs.h" +#include "error.h" +#include "log.h" +#include "db.h" + void Dirs::Clear() diff --git a/core/dirs.h b/core/dirs.h index 784299a..8d5c13f 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -2,22 +2,20 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfiledirs -#define headerfiledirs +#ifndef headerfilecmslucoredirs +#define headerfilecmslucoredirs #include #include #include + #include "item.h" -#include "error.h" -#include "log.h" -#include "db.h" #include "dircontainer.h" diff --git a/core/done.cpp b/core/done.cpp index d07b06c..663d343 100755 --- a/core/done.cpp +++ b/core/done.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ diff --git a/core/done.h b/core/done.h index 11b7da0..3185b46 100755 --- a/core/done.h +++ b/core/done.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfiledone -#define headerfiledone +#ifndef headerfilecmslucoredone +#define headerfilecmslucoredone diff --git a/core/error.cpp b/core/error.cpp index 55b0f7b..1b70d15 100755 --- a/core/error.cpp +++ b/core/error.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ diff --git a/core/error.h b/core/error.h index 48c63e8..5e765c5 100755 --- a/core/error.h +++ b/core/error.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileerror -#define headerfileerror +#ifndef headerfilecmslucoreerror +#define headerfilecmslucoreerror #include #include "log.h" diff --git a/core/function.cpp b/core/function.cpp index 5100d0b..a2c9e28 100755 --- a/core/function.cpp +++ b/core/function.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,7 @@ #include "function.h" + Function::Function() { code = FUN_NONE; diff --git a/core/function.h b/core/function.h index 5dc9839..1d2e835 100755 --- a/core/function.h +++ b/core/function.h @@ -7,11 +7,10 @@ * */ -#ifndef headerfilefunction -#define headerfilefunction +#ifndef headerfilecmslucorefunction +#define headerfilecmslucorefunction #include -#include "log.h" #include "item.h" diff --git a/core/functioncodeparser.cpp b/core/functioncodeparser.cpp index 9bc6016..f7c2088 100755 --- a/core/functioncodeparser.cpp +++ b/core/functioncodeparser.cpp @@ -2,12 +2,14 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "functioncodeparser.h" +#include "function.h" +#include "log.h" diff --git a/core/functioncodeparser.h b/core/functioncodeparser.h index cf96e53..28a33ff 100755 --- a/core/functioncodeparser.h +++ b/core/functioncodeparser.h @@ -2,19 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilefunctioncodeparser -#define headerfilefunctioncodeparser +#ifndef headerfilecmslucorefunctioncodeparser +#define headerfilecmslucorefunctioncodeparser #include #include -#include "function.h" + #include "item.h" -#include "log.h" class FunctionCodeParser diff --git a/core/functionparser.cpp b/core/functionparser.cpp index 951e905..a59efbe 100755 --- a/core/functionparser.cpp +++ b/core/functionparser.cpp @@ -2,13 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "functionparser.h" - +#include "log.h" +#include "item.h" +#include "error.h" +#include "data.h" +#include "db.h" +#include "request.h" diff --git a/core/functionparser.h b/core/functionparser.h index 77b9510..018b642 100755 --- a/core/functionparser.h +++ b/core/functionparser.h @@ -2,20 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilefunctionparser -#define headerfilefunctionparser +#ifndef headerfilecmslucorefunctionparser +#define headerfilecmslucorefunctionparser -#include "request.h" -#include "log.h" -#include "item.h" -#include "error.h" -#include "data.h" -#include "db.h" +#include "requesttypes.h" #ifdef APPFUNCTIONS #include "../app/content.h" diff --git a/core/functions.cpp b/core/functions.cpp index 9416f51..eb406ab 100755 --- a/core/functions.cpp +++ b/core/functions.cpp @@ -14,6 +14,7 @@ + void Functions::Clear() { table.clear(); diff --git a/core/functions.h b/core/functions.h index d5f3ee7..a1b803b 100755 --- a/core/functions.h +++ b/core/functions.h @@ -2,18 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilefunctions -#define headerfilefunctions +#ifndef headerfilecmslucorefunctions +#define headerfilecmslucorefunctions #include #include + #include "function.h" -#include "functioncodeparser.h" diff --git a/core/getparser.h b/core/getparser.h index 192c3af..738de7a 100755 --- a/core/getparser.h +++ b/core/getparser.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilegetparser -#define headerfilegetparser +#ifndef headerfilecmslucoregetparser +#define headerfilecmslucoregetparser #include "httpsimpleparser.h" #include "requesttypes.h" diff --git a/core/group.h b/core/group.h index 1869193..d5c52e8 100755 --- a/core/group.h +++ b/core/group.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilegroup -#define headerfilegroup +#ifndef headerfilecmslucoregroup +#define headerfilecmslucoregroup #include #include diff --git a/core/groups.cpp b/core/groups.cpp index f3962ca..0937260 100755 --- a/core/groups.cpp +++ b/core/groups.cpp @@ -2,14 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "groups.h" - - +#include "db.h" diff --git a/core/groups.h b/core/groups.h index e56f91b..f99bf6b 100755 --- a/core/groups.h +++ b/core/groups.h @@ -2,17 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilegroups -#define headerfilegroups +#ifndef headerfilecmslucoregroups +#define headerfilecmslucoregroups #include + #include "group.h" -#include "db.h" #include "ugcontainer.h" diff --git a/core/httpsimpleparser.cpp b/core/httpsimpleparser.cpp index c0e3ac3..33b284f 100755 --- a/core/httpsimpleparser.cpp +++ b/core/httpsimpleparser.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ diff --git a/core/httpsimpleparser.h b/core/httpsimpleparser.h index a40994e..e532fc9 100755 --- a/core/httpsimpleparser.h +++ b/core/httpsimpleparser.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilehttpsimpleparser -#define headerfilehttpsimpleparser +#ifndef headerfilecmslucorehttpsimpleparser +#define headerfilecmslucorehttpsimpleparser #include diff --git a/core/item.h b/core/item.h index a5ab457..2c1c7e6 100755 --- a/core/item.h +++ b/core/item.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileitem -#define headerfileitem +#ifndef headerfilecmslucoreitem +#define headerfilecmslucoreitem #include diff --git a/core/lastcontainer.cpp b/core/lastcontainer.cpp index 32f52e4..a13b819 100755 --- a/core/lastcontainer.cpp +++ b/core/lastcontainer.cpp @@ -9,6 +9,7 @@ #include "lastcontainer.h" +#include "log.h" diff --git a/core/lastcontainer.h b/core/lastcontainer.h index 37992aa..72d1d73 100755 --- a/core/lastcontainer.h +++ b/core/lastcontainer.h @@ -7,15 +7,14 @@ * */ -#ifndef headerfilelastcontainer33 -#define headerfilelastcontainer33 +#ifndef headerfilecmslucorelastcontainer +#define headerfilecmslucorelastcontainer #include #include #include #include -#include "log.h" // how many items we store in the 'last' function diff --git a/core/log.cpp b/core/log.cpp index e4fc686..79f0611 100755 --- a/core/log.cpp +++ b/core/log.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ diff --git a/core/log.h b/core/log.h index 6043552..9de0795 100755 --- a/core/log.h +++ b/core/log.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilelog -#define headerfilelog +#ifndef headerfilecmslucorelog +#define headerfilecmslucorelog #include diff --git a/core/main.cpp b/core/main.cpp index 2a18676..8873bcf 100755 --- a/core/main.cpp +++ b/core/main.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,7 @@ #include #include #include + #include "requestcontroller.h" #include "data.h" #include "log.h" diff --git a/core/misc.cpp b/core/misc.cpp index d2fbb89..5c3088a 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -2,12 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "misc.h" +#include "log.h" diff --git a/core/misc.h b/core/misc.h index c776875..6b530cc 100755 --- a/core/misc.h +++ b/core/misc.h @@ -2,19 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilemisc -#define headerfilemisc +#ifndef headerfilecmslucoremisc +#define headerfilecmslucoremisc #include #include #include -#include "log.h" #include "item.h" #define MAJOR_VER 0 diff --git a/core/mount.h b/core/mount.h index 0229a21..e4c236a 100755 --- a/core/mount.h +++ b/core/mount.h @@ -8,8 +8,8 @@ */ -#ifndef headerfilecoremount -#define headerfilecoremount +#ifndef headerfilecmslucoremount +#define headerfilecmslucoremount #include #include diff --git a/core/mountparser.cpp b/core/mountparser.cpp index e1d550a..ad29087 100755 --- a/core/mountparser.cpp +++ b/core/mountparser.cpp @@ -9,6 +9,7 @@ #include "mountparser.h" #include "data.h" +#include "log.h" diff --git a/core/mountparser.h b/core/mountparser.h index 0654521..43b3d3d 100755 --- a/core/mountparser.h +++ b/core/mountparser.h @@ -7,17 +7,15 @@ * */ -#ifndef headerfilecoremountparser -#define headerfilecoremountparser +#ifndef headerfilecmslucoremountparser +#define headerfilecmslucoremountparser #include #include -#include "log.h" #include "mount.h" -#include "error.h" #include "item.h" - +#include "error.h" diff --git a/core/mounts.cpp b/core/mounts.cpp index 040c437..c47accf 100755 --- a/core/mounts.cpp +++ b/core/mounts.cpp @@ -9,6 +9,9 @@ #include "mounts.h" #include "data.h" +#include "request.h" +#include "log.h" +#include "mountparser.h" void Mounts::ReadMounts() diff --git a/core/mounts.h b/core/mounts.h index d347264..5702a24 100755 --- a/core/mounts.h +++ b/core/mounts.h @@ -8,15 +8,12 @@ */ -#ifndef headerfilecoremounts -#define headerfilecoremounts +#ifndef headerfilecmslucorecoremounts +#define headerfilecmslucorecoremounts #include #include "mount.h" -#include "request.h" -#include "log.h" -#include "mountparser.h" diff --git a/core/postparser.h b/core/postparser.h index 35a2309..100fefe 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilepostparser -#define headerfilepostparser +#ifndef headerfilecmslucorepostparser +#define headerfilecmslucorepostparser #include #include diff --git a/core/request.cpp b/core/request.cpp index 77cbf5c..3331f28 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -2,12 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "request.h" +#include "getparser.h" +#include "postparser.h" +#include "cookieparser.h" +#include "log.h" diff --git a/core/request.h b/core/request.h index 728b392..94bd92a 100755 --- a/core/request.h +++ b/core/request.h @@ -2,32 +2,29 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilerequest -#define headerfilerequest +#ifndef headerfilecmslucorerequest +#define headerfilecmslucorerequest #include #include #include #include #include -#include "requesttypes.h" -#include "log.h" -#include "session.h" -#include "getparser.h" -#include "postparser.h" -#include "cookieparser.h" +#include "requesttypes.h" +#include "session.h" #include "item.h" #include "error.h" #include "function.h" #include "thread.h" + struct Request { // request id diff --git a/core/requestcontroller.cpp b/core/requestcontroller.cpp index d3bb5cc..df09aab 100755 --- a/core/requestcontroller.cpp +++ b/core/requestcontroller.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "requestcontroller.h" +#include "data.h" +#include "log.h" +#include "request.h" +#include "postparser.h" +#include "cookieparser.h" diff --git a/core/requestcontroller.h b/core/requestcontroller.h index 804c29a..b2de620 100755 --- a/core/requestcontroller.h +++ b/core/requestcontroller.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilerequestcontroller -#define headerfilerequestcontroller +#ifndef headerfilecmslucorerequestcontroller +#define headerfilecmslucorerequestcontroller #include #include @@ -18,13 +18,10 @@ #include #include -#include "data.h" -#include "log.h" -#include "request.h" #include "../content/content.h" #include "sessionmanager.h" -#include "postparser.h" -#include "cookieparser.h" +#include "functionparser.h" +#include "sessioncontainer.h" class RequestController diff --git a/core/requesttypes.h b/core/requesttypes.h index 920822b..f682d69 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -2,13 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilerequesttypes -#define headerfilerequesttypes +#ifndef headerfilecmslucorerequesttypes +#define headerfilecmslucorerequesttypes #include #include diff --git a/core/session.cpp b/core/session.cpp index 13e8754..d856673 100755 --- a/core/session.cpp +++ b/core/session.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,7 @@ #include "session.h" + Session::Session() { Clear(); diff --git a/core/session.h b/core/session.h index 99af29b..9bc3b03 100755 --- a/core/session.h +++ b/core/session.h @@ -2,19 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilecoresession -#define headerfilecoresession +#ifndef headerfilecmslucoresession +#define headerfilecmslucoresession #include -#include "requesttypes.h" -#include "error.h" -#include "item.h" #include "done.h" +#include "item.h" +#include "error.h" #include "user.h" diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp index bc575aa..7dbbee7 100755 --- a/core/sessioncontainer.cpp +++ b/core/sessioncontainer.cpp @@ -2,13 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "sessioncontainer.h" #include "data.h" +#include "log.h" + void SessionContainer::Clear() { diff --git a/core/sessioncontainer.h b/core/sessioncontainer.h index cb5c199..d48c6b6 100755 --- a/core/sessioncontainer.h +++ b/core/sessioncontainer.h @@ -2,20 +2,22 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilesessioncontainer -#define headerfilesessioncontainer +#ifndef headerfilecmslucoresessioncontainer +#define headerfilecmslucoresessioncontainer #include #include #include + #include "session.h" -#include "log.h" + + class SessionContainer diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index 41240ab..4d28f4a 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "sessionmanager.h" +#include "request.h" +#include "log.h" +#include "data.h" +#include "session.h" + bool SessionManager::IsSession(long id) diff --git a/core/sessionmanager.h b/core/sessionmanager.h index 307c3b3..4525625 100755 --- a/core/sessionmanager.h +++ b/core/sessionmanager.h @@ -2,22 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilesessionmanager -#define headerfilesessionmanager +#ifndef headerfilecmslucoresessionmanager +#define headerfilecmslucoresessionmanager #include #include -#include "request.h" -#include "log.h" -#include "data.h" -#include "session.h" -#include "db.h" #include "sessioncontainer.h" diff --git a/core/thread.h b/core/thread.h index 9f3e45c..a98c520 100755 --- a/core/thread.h +++ b/core/thread.h @@ -7,12 +7,13 @@ * */ -#ifndef headerfilecorethread -#define headerfilecorethread +#ifndef headerfilecmslucorecorethread +#define headerfilecmslucorecorethread #include + class Thread { public: diff --git a/core/ugcontainer.h b/core/ugcontainer.h index 6abb1bd..647ac45 100755 --- a/core/ugcontainer.h +++ b/core/ugcontainer.h @@ -2,17 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileugcontainer -#define headerfileugcontainer +#ifndef headerfilecmslucoreugcontainer +#define headerfilecmslucoreugcontainer #include #include #include + #include "log.h" diff --git a/core/user.h b/core/user.h index 8922be0..c2ecf4f 100755 --- a/core/user.h +++ b/core/user.h @@ -2,17 +2,19 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileuser -#define headerfileuser +#ifndef headerfilecmslucoreuser +#define headerfilecmslucoreuser #include #include + + struct User { long id; diff --git a/core/users.cpp b/core/users.cpp index c8b0e3d..acefbc5 100755 --- a/core/users.cpp +++ b/core/users.cpp @@ -2,12 +2,13 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "users.h" +#include "db.h" diff --git a/core/users.h b/core/users.h index 96e8939..75c1a2f 100755 --- a/core/users.h +++ b/core/users.h @@ -2,17 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfileusers -#define headerfileusers +#ifndef headerfilecmslucoreusers +#define headerfilecmslucoreusers #include #include "user.h" -#include "db.h" #include "ugcontainer.h" diff --git a/templates/Makefile b/templates/Makefile index d69aff8..d3c825d 100755 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,25 +1,22 @@ -o = templates.o sys.o item.o doc.o user.o dir.o done.o priv.o patterncacher.o who.o last.o thread.o +include Makefile.o.dep -all: templates.a +all: $(o) -templates.a: $(o) - ar rcs templates.a $(o) .SUFFIXES: .cpp .o .cpp.o: - $(CC) -c $(CFLAGS) $< + $(CXX) -c $(CXXFLAGS) $< + + depend: makedepend $(DEPMACROS) -Y. -f- *.cpp > Makefile.dep - + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep clean: rm -f *.o - rm -f *.a - include Makefile.dep - - diff --git a/templates/Makefile.dep b/templates/Makefile.dep index cc0578a..d70be1f 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -1,149 +1,97 @@ # DO NOT DELETE -dir.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -dir.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -dir.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -dir.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -dir.o: ../core/groups.h ../core/functions.h ../core/function.h -dir.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -dir.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -dir.o: ../core/session.h ../core/done.h ../core/getparser.h -dir.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -dir.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -dir.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -dir.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h -doc.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -doc.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -doc.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -doc.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -doc.o: ../core/groups.h ../core/functions.h ../core/function.h -doc.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -doc.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -doc.o: ../core/session.h ../core/done.h ../core/getparser.h -doc.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -doc.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -doc.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -doc.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h -done.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -done.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -done.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -done.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -done.o: ../core/groups.h ../core/functions.h ../core/function.h -done.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -done.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -done.o: ../core/session.h ../core/done.h ../core/getparser.h -done.o: ../core/httpsimpleparser.h ../core/postparser.h -done.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -done.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -done.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -done.o: patterncacher.h ../app/templates.h -item.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -item.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -item.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -item.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -item.o: ../core/groups.h ../core/functions.h ../core/function.h -item.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -item.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -item.o: ../core/session.h ../core/done.h ../core/getparser.h -item.o: ../core/httpsimpleparser.h ../core/postparser.h -item.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -item.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -item.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -item.o: patterncacher.h ../app/templates.h -last.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -last.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -last.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -last.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -last.o: ../core/groups.h ../core/functions.h ../core/function.h -last.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -last.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -last.o: ../core/session.h ../core/done.h ../core/getparser.h -last.o: ../core/httpsimpleparser.h ../core/postparser.h -last.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -last.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -last.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -last.o: patterncacher.h ../app/templates.h ../core/lastcontainer.h -last.o: ../core/misc.h +dir.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +dir.o: ../app/templates.h ../core/request.h ../core/requesttypes.h +dir.o: ../core/session.h ../core/done.h ../core/item.h ../core/error.h +dir.o: ../core/log.h ../core/user.h ../core/function.h ../core/thread.h +dir.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h +dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h +dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h +dir.o: ../core/mount.h ../core/db.h ../core/log.h ../core/misc.h +doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +doc.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +doc.o: ../core/dircontainer.h ../core/users.h ../core/user.h +doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +doc.o: ../core/mounts.h ../core/mount.h ../core/request.h +doc.o: ../core/requesttypes.h ../core/session.h ../core/done.h +doc.o: ../core/error.h ../core/thread.h ../core/misc.h +done.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +done.o: ../app/templates.h ../core/request.h ../core/requesttypes.h +done.o: ../core/session.h ../core/done.h ../core/item.h ../core/error.h +done.o: ../core/log.h ../core/user.h ../core/function.h ../core/thread.h +done.o: ../core/misc.h +item.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +item.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +item.o: ../core/dircontainer.h ../core/users.h ../core/user.h +item.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +item.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +item.o: ../core/mounts.h ../core/mount.h ../core/request.h +item.o: ../core/requesttypes.h ../core/session.h ../core/done.h +item.o: ../core/error.h ../core/thread.h ../core/misc.h +last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +last.o: ../app/templates.h ../core/lastcontainer.h ../core/data.h +last.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h +last.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h +last.o: ../core/group.h ../core/functions.h ../core/function.h +last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +last.o: ../core/request.h ../core/requesttypes.h ../core/session.h +last.o: ../core/done.h ../core/error.h ../core/thread.h ../core/misc.h patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h +patterncacher.o: ../core/data.h ../core/dirs.h ../core/item.h +patterncacher.o: ../core/dircontainer.h ../core/users.h ../core/user.h +patterncacher.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +patterncacher.o: ../core/group.h ../core/functions.h ../core/function.h +patterncacher.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h patterncacher.o: ../core/log.h -priv.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -priv.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -priv.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -priv.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -priv.o: ../core/groups.h ../core/functions.h ../core/function.h -priv.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -priv.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -priv.o: ../core/session.h ../core/done.h ../core/getparser.h -priv.o: ../core/httpsimpleparser.h ../core/postparser.h -priv.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -priv.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -priv.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -priv.o: patterncacher.h ../app/templates.h -sys.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -sys.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -sys.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -sys.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -sys.o: ../core/groups.h ../core/functions.h ../core/function.h -sys.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -sys.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -sys.o: ../core/session.h ../core/done.h ../core/getparser.h -sys.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -sys.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -sys.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -sys.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h -templates.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -templates.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -templates.o: ../core/db.h ../core/dircontainer.h ../core/user.h -templates.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h -templates.o: ../core/users.h ../core/groups.h ../core/functions.h -templates.o: ../core/function.h ../core/functioncodeparser.h +priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +priv.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +priv.o: ../core/dircontainer.h ../core/users.h ../core/user.h +priv.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +priv.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +priv.o: ../core/mounts.h ../core/mount.h ../core/request.h +priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h +priv.o: ../core/error.h ../core/thread.h ../core/misc.h +sys.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +sys.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +sys.o: ../core/dircontainer.h ../core/users.h ../core/user.h +sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +sys.o: ../core/mounts.h ../core/mount.h ../core/request.h +sys.o: ../core/requesttypes.h ../core/session.h ../core/done.h +sys.o: ../core/error.h ../core/thread.h ../core/misc.h +templates.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +templates.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +templates.o: ../core/dircontainer.h ../core/users.h ../core/user.h +templates.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +templates.o: ../core/group.h ../core/functions.h ../core/function.h templates.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h -templates.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h -templates.o: ../core/postparser.h ../core/cookieparser.h -templates.o: ../core/mountparser.h ../core/request.h ../core/item.h -templates.o: ../core/db.h ../core/error.h ../core/user.h ../core/group.h -templates.o: ../core/users.h ../core/groups.h ../core/log.h patterncacher.h -templates.o: ../app/templates.h -thread.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -thread.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -thread.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -thread.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -thread.o: ../core/groups.h ../core/functions.h ../core/function.h -thread.o: ../core/functioncodeparser.h ../core/lastcontainer.h -thread.o: ../core/mounts.h ../core/mount.h ../core/request.h -thread.o: ../core/requesttypes.h ../core/session.h ../core/done.h -thread.o: ../core/getparser.h ../core/httpsimpleparser.h ../core/postparser.h -thread.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -thread.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -thread.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -thread.o: patterncacher.h ../app/templates.h -user.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -user.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -user.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -user.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -user.o: ../core/groups.h ../core/functions.h ../core/function.h -user.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -user.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -user.o: ../core/session.h ../core/done.h ../core/getparser.h -user.o: ../core/httpsimpleparser.h ../core/postparser.h -user.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h -user.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h -user.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h -user.o: patterncacher.h ../app/templates.h -who.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h -who.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h -who.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h -who.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h -who.o: ../core/groups.h ../core/functions.h ../core/function.h -who.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h -who.o: ../core/mount.h ../core/request.h ../core/requesttypes.h -who.o: ../core/session.h ../core/done.h ../core/getparser.h -who.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h -who.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h -who.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h -who.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h -who.o: ../core/sessioncontainer.h ../core/requestcontroller.h ../core/data.h -who.o: ../content/content.h ../templates/templates.h ../core/misc.h -who.o: ../core/function.h ../core/functionparser.h ../app/content.h -who.o: ../core/sessionmanager.h ../core/sessioncontainer.h +templates.o: ../core/done.h ../core/error.h ../core/thread.h ../core/misc.h +thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +thread.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +thread.o: ../core/dircontainer.h ../core/users.h ../core/user.h +thread.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +thread.o: ../core/group.h ../core/functions.h ../core/function.h +thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h +thread.o: ../core/done.h ../core/error.h ../core/thread.h ../core/misc.h +user.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +user.o: ../app/templates.h ../core/data.h ../core/dirs.h ../core/item.h +user.o: ../core/dircontainer.h ../core/users.h ../core/user.h +user.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +user.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +user.o: ../core/mounts.h ../core/mount.h ../core/request.h +user.o: ../core/requesttypes.h ../core/session.h ../core/done.h +user.o: ../core/error.h ../core/thread.h ../core/misc.h +who.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +who.o: ../app/templates.h ../core/sessioncontainer.h ../core/session.h +who.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h +who.o: ../core/user.h ../core/requestcontroller.h ../content/content.h +who.o: ../templates/templates.h ../core/sessionmanager.h +who.o: ../core/sessioncontainer.h ../core/functionparser.h +who.o: ../core/requesttypes.h ../app/content.h ../core/data.h ../core/dirs.h +who.o: ../core/dircontainer.h ../core/users.h ../core/ugcontainer.h +who.o: ../core/groups.h ../core/group.h ../core/functions.h +who.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h +who.o: ../core/mount.h ../core/request.h ../core/thread.h ../core/misc.h diff --git a/templates/Makefile.o.dep b/templates/Makefile.o.dep new file mode 100755 index 0000000..ba42b75 --- /dev/null +++ b/templates/Makefile.o.dep @@ -0,0 +1 @@ +o = dir.o doc.o done.o item.o last.o patterncacher.o priv.o sys.o templates.o thread.o user.o who.o diff --git a/templates/dir.cpp b/templates/dir.cpp index d070691..bd7009b 100755 --- a/templates/dir.cpp +++ b/templates/dir.cpp @@ -2,12 +2,18 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/request.h" +#include "../core/data.h" +#include "../core/db.h" +#include "../core/log.h" +#include "../core/misc.h" + namespace TemplatesFunctions diff --git a/templates/doc.cpp b/templates/doc.cpp index a2e708e..20be61b 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -2,12 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + namespace TemplatesFunctions diff --git a/templates/done.cpp b/templates/done.cpp index 231153f..a9d97b7 100755 --- a/templates/done.cpp +++ b/templates/done.cpp @@ -2,12 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/request.h" +#include "../core/misc.h" + namespace TemplatesFunctions diff --git a/templates/item.cpp b/templates/item.cpp index a7d5903..cc64939 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + + namespace TemplatesFunctions diff --git a/templates/last.cpp b/templates/last.cpp index b5ec4de..8a7df7c 100755 --- a/templates/last.cpp +++ b/templates/last.cpp @@ -2,16 +2,20 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" #include "../core/lastcontainer.h" +#include "../core/data.h" +#include "../core/request.h" #include "../core/misc.h" + + namespace TemplatesFunctions { static size_t last_reqid = 0; diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 468479b..0bb57c5 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -2,12 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "patterncacher.h" +#include "../core/data.h" +#include "../core/log.h" + PatternCacher::PatternCacher() diff --git a/templates/patterncacher.h b/templates/patterncacher.h index 5765fa0..d6b0e35 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -2,20 +2,21 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfilepatterncacher -#define headerfilepatterncacher +#ifndef headerfilecmslutemplatespatterncacher +#define headerfilecmslutemplatespatterncacher #include #include #include "../core/item.h" #include "../../ezc/src/ezc.h" -#include "../core/log.h" + + diff --git a/templates/priv.cpp b/templates/priv.cpp index 82875c8..656fffd 100755 --- a/templates/priv.cpp +++ b/templates/priv.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + + namespace TemplatesFunctions diff --git a/templates/sys.cpp b/templates/sys.cpp index f71f0f9..7eba6b6 100755 --- a/templates/sys.cpp +++ b/templates/sys.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + + namespace TemplatesFunctions diff --git a/templates/templates.cpp b/templates/templates.cpp index 6b335c1..ccfac9c 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -2,13 +2,15 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" - +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" diff --git a/templates/templates.h b/templates/templates.h index e78c7b6..574d397 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -2,38 +2,26 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ -#ifndef headerfiletemplates -#define headerfiletemplates +#ifndef headerfilecmslutemplatestemplates +#define headerfilecmslutemplatestemplates #include #include - #include "../../ezc/src/ezc.h" -#include "../core/data.h" -#include "../core/request.h" -#include "../core/item.h" -#include "../core/db.h" -#include "../core/error.h" -#include "../core/user.h" -#include "../core/group.h" -#include "../core/users.h" -#include "../core/groups.h" -#include "../core/log.h" #include "patterncacher.h" + #ifdef APPTEMPLATES #include "../app/templates.h" #endif - - namespace TemplatesFunctions { using Ezc::Info; diff --git a/templates/thread.cpp b/templates/thread.cpp index 3ff8b4a..884aa9f 100755 --- a/templates/thread.cpp +++ b/templates/thread.cpp @@ -2,12 +2,16 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + namespace TemplatesFunctions diff --git a/templates/user.cpp b/templates/user.cpp index 96d1f2d..40c35e2 100755 --- a/templates/user.cpp +++ b/templates/user.cpp @@ -2,12 +2,17 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +#include "../core/data.h" +#include "../core/request.h" +#include "../core/misc.h" + + namespace TemplatesFunctions diff --git a/templates/who.cpp b/templates/who.cpp index ec6b974..1ef2579 100755 --- a/templates/who.cpp +++ b/templates/who.cpp @@ -2,7 +2,7 @@ * This file is a part of CMSLU -- Content Management System like Unix * and is not publicly distributed * - * Copyright (c) 2008, Tomasz Sowa + * Copyright (c) 2008-2009, Tomasz Sowa * All rights reserved. * */ @@ -10,9 +10,12 @@ #include "templates.h" #include "../core/sessioncontainer.h" #include "../core/requestcontroller.h" +#include "../core/data.h" +#include "../core/request.h" #include "../core/misc.h" + namespace TemplatesFunctions {