From c89d4f76bcfaa1d2c4a2ea10a4a0e2f70b81373b Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 26 Jun 2022 06:15:19 +0200 Subject: [PATCH] add global Makefile src/Makefile uses now 'find' for looking for *.cpp files and we don't need Makefile.o.dep anymore --- Makefile | 33 ++++ samples/Makefile | 77 ++++----- samples/Makefile.dep | 43 +++-- samples/Makefile.o.dep | 1 - src/Makefile | 43 +++-- src/Makefile.dep | 369 ++++++++++++++++++++++++++++++++++------- src/Makefile.o.dep | 1 - 7 files changed, 426 insertions(+), 141 deletions(-) create mode 100644 Makefile delete mode 100644 samples/Makefile.o.dep delete mode 100644 src/Makefile.o.dep diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..57e66b8 --- /dev/null +++ b/Makefile @@ -0,0 +1,33 @@ + + +export CXX +export CXXFLAGS +export AR + + +all: src + + +src: FORCE + $(MAKE) -C src + + +samples: FORCE + $(MAKE) -C src + $(MAKE) -C samples + + +clean: FORCE + $(MAKE) -C src clean + $(MAKE) -C samples clean + + +depend: FORCE + $(MAKE) -C src depend + $(MAKE) -C samples depend + + + + +FORCE: + diff --git a/samples/Makefile b/samples/Makefile index 855226e..91ae2eb 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -1,68 +1,57 @@ -include Makefile.o.dep +sourcefiles:=$(shell find . -name "*.cpp") +objfiles:=$(patsubst %.cpp,%.o,$(sourcefiles)) -name=mormsample -ifndef GLOBAL_WORKING_DIR -GLOBAL_WORKING_DIR := $(shell pwd)/../.. + +ifndef CXX +CXX = g++ +endif + +ifndef CXXFLAGS +CXXFLAGS = -Wall -pedantic -O2 -std=c++20 -I../src -I../../pikotools/src -I/usr/local/include +endif + +ifndef LDFLAGS +LDFLAGS = -L/usr/local/lib endif -CXX = g++10 -#CXX = clang++ - -# -fsanitize=address -# -Wl,-rpath=/usr/local/lib/gcc5 or just compile with -static-libstdc++ - -CXXFLAGS = -Wl,-rpath=/usr/local/lib/gcc10 -Wfatal-errors -fPIC -Wall -pedantic -O0 -g3 -pthread -std=c++20 -I/usr/local/include -I$(GLOBAL_WORKING_DIR)/pikotools/src -I$(GLOBAL_WORKING_DIR)/morm/src -LDFLAGS = -L/usr/local/lib +name = mormsample -export CXX -export CXXFLAGS -export LDFLAGS -export GLOBAL_WORKING_DIR +all: $(name) -current_path := $(shell pwd) -global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR)) +$(name): morm pikotools $(objfiles) + $(CXX) -o $(name) $(CXXFLAGS) $(LDFLAGS) $(objfiles) ../src/morm.a ../../pikotools/src/pikotools.a $(LDFLAGS) -lpq -lpthread -# IMPROVE ME -# add dependency to pikotools -all: morm $(name) + +morm: FORCE + @cd ../src ; $(MAKE) -e -$(name): morm pikotools $(o) - $(CXX) -o $(name) $(CXXFLAGS) $(LDFLAGS) $(o) $(GLOBAL_WORKING_DIR)/morm/src/morm.a $(GLOBAL_WORKING_DIR)/pikotools/src/pikotools.a $(LDFLAGS) -lpq -lpthread - - -.PHONY: morm - - -morm: - @cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e - - -pikotools: - @cd $(GLOBAL_WORKING_DIR)/pikotools/src ; $(MAKE) -e +pikotools: FORCE + @cd ../../pikotools/src ; $(MAKE) -e %.o: %.cpp - $(CXX) -c $(CXXFLAGS) $< - - -depend: - makedepend -Y. -I$(global_relative_working_dir)/pikotools/src -I$(global_relative_working_dir)/morm/src -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 + $(CXX) -c $(CXXFLAGS) -o $@ $< clean: - @cd $(GLOBAL_WORKING_DIR)/morm/src ; $(MAKE) -e clean - rm -f *.o + rm -f $(objfiles) rm -f $(name) +depend: + makedepend -Y. -I../src -I../../pikotools/src -f- $(sourcefiles) > Makefile.dep -include Makefile.dep +FORCE: + + + + +-include Makefile.dep + diff --git a/samples/Makefile.dep b/samples/Makefile.dep index 65d4665..c43bbec 100644 --- a/samples/Makefile.dep +++ b/samples/Makefile.dep @@ -1,17 +1,30 @@ # DO NOT DELETE -main.o: sample01.h basesample.h ../../morm/src/morm.h -main.o: ../../morm/src/morm_types.h ../../morm/src/model.h -main.o: ../../morm/src/modelconnector.h ../../morm/src/clearer.h -main.o: ../../morm/src/dbconnector.h ../../morm/src/queryresult.h -main.o: ../../morm/src/ft.h ../../morm/src/flatconnector.h -main.o: ../../morm/src/dbexpression.h ../../morm/src/baseexpression.h -main.o: ../../morm/src/modelenv.h ../../morm/src/modeldata.h -main.o: ../../morm/src/cursorhelper.h ../../morm/src/finderhelper.h -main.o: ../../morm/src/fieldvaluehelper.h ../../morm/src/flatexpression.h -main.o: ../../morm/src/modelwrapper.h ../../morm/src/finder.h -main.o: ../../morm/src/cursor.h ../../morm/src/jsonexpression.h -main.o: ../../morm/src/postgresqlexpression.h ../../morm/src/jsonconnector.h -main.o: ../../morm/src/postgresqlconnector.h -main.o: ../../morm/src/postgresqlqueryresult.h person.h language.h -main.o: attachment.h type.h attachment2.h +./main.o: ../../pikotools/src/mainoptions/mainoptionsparser.h +./main.o: ../../pikotools/src/space/space.h +./main.o: ../../pikotools/src/textstream/types.h +./main.o: ../../pikotools/src/convert/inttostr.h +./main.o: ../../pikotools/src/utf8/utf8.h +./main.o: ../../pikotools/src/textstream/stream.h +./main.o: ../../pikotools/src/utf8/utf8_templates.h +./main.o: ../../pikotools/src/utf8/utf8_private.h sample01.h basesample.h +./main.o: ../src/morm.h ../src/morm_types.h ../src/model.h +./main.o: ../../pikotools/src/textstream/textstream.h +./main.o: ../../pikotools/src/textstream/stream.h +./main.o: ../../pikotools/src/date/date.h +./main.o: ../../pikotools/src/membuffer/membuffer.h +./main.o: ../../pikotools/src/textstream/types.h +./main.o: ../../pikotools/src/utf8/utf8_stream.h ../src/modelconnector.h +./main.o: ../src/clearer.h ../src/ft.h ../src/dbconnector.h +./main.o: ../../pikotools/src/log/log.h ../../pikotools/src/log/filelog.h +./main.o: ../src/queryresult.h ../src/flatconnector.h ../src/dbexpression.h +./main.o: ../src/baseexpression.h ../src/modelenv.h ../src/modeldata.h +./main.o: ../src/cursorhelper.h ../src/finderhelper.h +./main.o: ../src/fieldvaluehelper.h ../src/wrapper.h ../src/spacewrapper.h +./main.o: ../src/baseobjectwrapper.h ../src/modelcontainerwrapper.h +./main.o: ../../pikotools/src/convert/text.h ../src/flatexpression.h +./main.o: ../src/finder.h ../src/cursor.h ../src/jsonexpression.h +./main.o: ../src/postgresqlexpression.h ../src/jsonconnector.h +./main.o: ../src/postgresqlconnector.h ../src/postgresqlqueryresult.h +./main.o: ../src/transaction.h person.h language.h attachment.h type.h +./main.o: attachment2.h diff --git a/samples/Makefile.o.dep b/samples/Makefile.o.dep deleted file mode 100644 index 89ad445..0000000 --- a/samples/Makefile.o.dep +++ /dev/null @@ -1 +0,0 @@ -o = main.o \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index 5594a4c..e92b77d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,36 +1,45 @@ -include Makefile.o.dep +sourcefiles:=$(shell find . -name "*.cpp") +objfiles:=$(patsubst %.cpp,%.o,$(sourcefiles)) -libname=morm.a -ifndef GLOBAL_WORKING_DIR -GLOBAL_WORKING_DIR := $(shell pwd)/../.. + +ifndef CXX +CXX = g++ endif -current_path := $(shell pwd) -global_relative_working_dir := $(shell relative_path $(current_path) $(GLOBAL_WORKING_DIR)) +ifndef CXXFLAGS +CXXFLAGS = -Wall -pedantic -O2 -std=c++20 -I../../pikotools/src -I/usr/local/include +endif +ifndef AR +AR = ar +endif + + + + +libname = morm.a all: $(libname) -$(libname): $(o) - $(AR) rcs $(libname) $(o) +$(libname): $(objfiles) + $(AR) rcs $(libname) $(objfiles) %.o: %.cpp - $(CXX) -c $(CXXFLAGS) -I$(GLOBAL_WORKING_DIR)/pikotools $< - - -depend: - makedepend -Y. -I$(global_relative_working_dir)/pikotools -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 + $(CXX) -c $(CXXFLAGS) -o $@ $< clean: - rm -f *.o + rm -f $(objfiles) rm -f $(libname) -include Makefile.dep +depend: + makedepend -Y. -I../../pikotools/src -f- $(sourcefiles) > Makefile.dep + + +-include Makefile.dep + diff --git a/src/Makefile.dep b/src/Makefile.dep index 79b39a0..fb7002a 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -1,65 +1,308 @@ # DO NOT DELETE -baseexpression.o: baseexpression.h morm_types.h modelenv.h modeldata.h -baseexpression.o: cursorhelper.h queryresult.h finderhelper.h -baseexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h -baseexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h model.h -baseexpression.o: modelconnector.h clearer.h dbconnector.h flatconnector.h -baseexpression.o: dbexpression.h flatexpression.h -clearer.o: clearer.h ft.h model.h modelconnector.h dbconnector.h -clearer.o: queryresult.h flatconnector.h dbexpression.h baseexpression.h -clearer.o: morm_types.h modelenv.h modeldata.h cursorhelper.h finderhelper.h -clearer.o: fieldvaluehelper.h wrapper.h spacewrapper.h baseobjectwrapper.h -clearer.o: modelcontainerwrapper.h flatexpression.h -dbconnector.o: dbconnector.h queryresult.h ft.h dbexpression.h -dbconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h -dbconnector.o: cursorhelper.h finderhelper.h fieldvaluehelper.h wrapper.h -dbconnector.o: spacewrapper.h baseobjectwrapper.h modelcontainerwrapper.h -dbconnector.o: model.h modelconnector.h clearer.h flatconnector.h -dbconnector.o: flatexpression.h -dbexpression.o: dbexpression.h baseexpression.h morm_types.h modelenv.h -dbexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h -dbexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h -dbexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h -flatconnector.o: flatconnector.h flatexpression.h baseexpression.h -flatconnector.o: morm_types.h modelenv.h modeldata.h cursorhelper.h -flatconnector.o: queryresult.h finderhelper.h fieldvaluehelper.h wrapper.h -flatconnector.o: spacewrapper.h baseobjectwrapper.h modelcontainerwrapper.h -flatconnector.o: ft.h model.h modelconnector.h clearer.h dbconnector.h -flatconnector.o: dbexpression.h -flatexpression.o: flatexpression.h baseexpression.h morm_types.h modelenv.h -flatexpression.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h -flatexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h -flatexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h -jsonconnector.o: jsonconnector.h flatconnector.h jsonexpression.h -jsonconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h -jsonconnector.o: modeldata.h cursorhelper.h queryresult.h finderhelper.h -jsonconnector.o: fieldvaluehelper.h wrapper.h spacewrapper.h -jsonconnector.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h -jsonexpression.o: jsonexpression.h flatexpression.h baseexpression.h -jsonexpression.o: morm_types.h modelenv.h modeldata.h cursorhelper.h -jsonexpression.o: queryresult.h finderhelper.h fieldvaluehelper.h wrapper.h -jsonexpression.o: spacewrapper.h baseobjectwrapper.h modelcontainerwrapper.h -jsonexpression.o: ft.h -model.o: model.h modelconnector.h clearer.h ft.h dbconnector.h queryresult.h -model.o: flatconnector.h dbexpression.h baseexpression.h morm_types.h -model.o: modelenv.h modeldata.h cursorhelper.h finderhelper.h -model.o: fieldvaluehelper.h wrapper.h spacewrapper.h baseobjectwrapper.h -model.o: modelcontainerwrapper.h flatexpression.h -modelconnector.o: modelconnector.h clearer.h ft.h dbconnector.h queryresult.h -modelconnector.o: flatconnector.h -postgresqlconnector.o: postgresqlconnector.h dbconnector.h queryresult.h ft.h -postgresqlconnector.o: postgresqlqueryresult.h postgresqlexpression.h -postgresqlconnector.o: dbexpression.h baseexpression.h morm_types.h -postgresqlconnector.o: modelenv.h modeldata.h cursorhelper.h finderhelper.h -postgresqlconnector.o: fieldvaluehelper.h wrapper.h spacewrapper.h -postgresqlconnector.o: baseobjectwrapper.h modelcontainerwrapper.h -postgresqlexpression.o: postgresqlexpression.h dbexpression.h -postgresqlexpression.o: baseexpression.h morm_types.h modelenv.h modeldata.h -postgresqlexpression.o: cursorhelper.h queryresult.h finderhelper.h -postgresqlexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h -postgresqlexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h -postgresqlqueryresult.o: postgresqlqueryresult.h queryresult.h -queryresult.o: queryresult.h -transaction.o: transaction.h modelconnector.h clearer.h ft.h dbconnector.h -transaction.o: queryresult.h flatconnector.h +./baseexpression.o: baseexpression.h +./baseexpression.o: ../../pikotools/src/textstream/textstream.h +./baseexpression.o: ../../pikotools/src/textstream/stream.h +./baseexpression.o: ../../pikotools/src/space/space.h +./baseexpression.o: ../../pikotools/src/textstream/types.h +./baseexpression.o: ../../pikotools/src/convert/inttostr.h +./baseexpression.o: ../../pikotools/src/utf8/utf8.h +./baseexpression.o: ../../pikotools/src/textstream/stream.h +./baseexpression.o: ../../pikotools/src/utf8/utf8_templates.h +./baseexpression.o: ../../pikotools/src/utf8/utf8_private.h +./baseexpression.o: ../../pikotools/src/date/date.h +./baseexpression.o: ../../pikotools/src/membuffer/membuffer.h +./baseexpression.o: ../../pikotools/src/textstream/types.h +./baseexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h +./baseexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h +./baseexpression.o: ../../pikotools/src/log/log.h +./baseexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h +./baseexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./baseexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./baseexpression.o: ../../pikotools/src/convert/text.h model.h +./baseexpression.o: modelconnector.h clearer.h dbconnector.h flatconnector.h +./baseexpression.o: dbexpression.h flatexpression.h +./clearer.o: clearer.h ../../pikotools/src/date/date.h +./clearer.o: ../../pikotools/src/convert/inttostr.h +./clearer.o: ../../pikotools/src/space/space.h +./clearer.o: ../../pikotools/src/textstream/types.h +./clearer.o: ../../pikotools/src/utf8/utf8.h +./clearer.o: ../../pikotools/src/textstream/stream.h +./clearer.o: ../../pikotools/src/utf8/utf8_templates.h +./clearer.o: ../../pikotools/src/utf8/utf8_private.h ft.h model.h +./clearer.o: ../../pikotools/src/textstream/textstream.h +./clearer.o: ../../pikotools/src/textstream/stream.h +./clearer.o: ../../pikotools/src/membuffer/membuffer.h +./clearer.o: ../../pikotools/src/textstream/types.h +./clearer.o: ../../pikotools/src/utf8/utf8_stream.h modelconnector.h +./clearer.o: dbconnector.h ../../pikotools/src/log/log.h +./clearer.o: ../../pikotools/src/log/filelog.h queryresult.h flatconnector.h +./clearer.o: dbexpression.h baseexpression.h morm_types.h modelenv.h +./clearer.o: modeldata.h cursorhelper.h finderhelper.h fieldvaluehelper.h +./clearer.o: wrapper.h spacewrapper.h baseobjectwrapper.h +./clearer.o: modelcontainerwrapper.h ../../pikotools/src/convert/text.h +./clearer.o: flatexpression.h +./dbconnector.o: ../../pikotools/src/space/spaceparser.h +./dbconnector.o: ../../pikotools/src/space/space.h +./dbconnector.o: ../../pikotools/src/textstream/types.h +./dbconnector.o: ../../pikotools/src/convert/inttostr.h +./dbconnector.o: ../../pikotools/src/utf8/utf8.h +./dbconnector.o: ../../pikotools/src/textstream/stream.h +./dbconnector.o: ../../pikotools/src/utf8/utf8_templates.h +./dbconnector.o: ../../pikotools/src/utf8/utf8_private.h +./dbconnector.o: ../../pikotools/src/convert/baseparser.h +./dbconnector.o: ../../pikotools/src/textstream/textstream.h +./dbconnector.o: ../../pikotools/src/textstream/stream.h +./dbconnector.o: ../../pikotools/src/space/space.h +./dbconnector.o: ../../pikotools/src/date/date.h +./dbconnector.o: ../../pikotools/src/membuffer/membuffer.h +./dbconnector.o: ../../pikotools/src/textstream/types.h +./dbconnector.o: ../../pikotools/src/utf8/utf8_stream.h dbconnector.h +./dbconnector.o: ../../pikotools/src/log/log.h +./dbconnector.o: ../../pikotools/src/log/filelog.h queryresult.h ft.h +./dbconnector.o: dbexpression.h baseexpression.h morm_types.h modelenv.h +./dbconnector.o: modeldata.h cursorhelper.h finderhelper.h fieldvaluehelper.h +./dbconnector.o: wrapper.h spacewrapper.h baseobjectwrapper.h +./dbconnector.o: modelcontainerwrapper.h ../../pikotools/src/convert/text.h +./dbconnector.o: model.h modelconnector.h clearer.h flatconnector.h +./dbconnector.o: flatexpression.h ../../pikotools/src/convert/convert.h +./dbconnector.o: ../../pikotools/src/convert/inttostr.h +./dbconnector.o: ../../pikotools/src/convert/patternreplacer.h +./dbconnector.o: ../../pikotools/src/convert/strtoint.h +./dbconnector.o: ../../pikotools/src/convert/text.h +./dbconnector.o: ../../pikotools/src/convert/misc.h +./dbconnector.o: ../../pikotools/src/convert/double.h +./dbexpression.o: dbexpression.h baseexpression.h +./dbexpression.o: ../../pikotools/src/textstream/textstream.h +./dbexpression.o: ../../pikotools/src/textstream/stream.h +./dbexpression.o: ../../pikotools/src/space/space.h +./dbexpression.o: ../../pikotools/src/textstream/types.h +./dbexpression.o: ../../pikotools/src/convert/inttostr.h +./dbexpression.o: ../../pikotools/src/utf8/utf8.h +./dbexpression.o: ../../pikotools/src/textstream/stream.h +./dbexpression.o: ../../pikotools/src/utf8/utf8_templates.h +./dbexpression.o: ../../pikotools/src/utf8/utf8_private.h +./dbexpression.o: ../../pikotools/src/date/date.h +./dbexpression.o: ../../pikotools/src/membuffer/membuffer.h +./dbexpression.o: ../../pikotools/src/textstream/types.h +./dbexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h +./dbexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h +./dbexpression.o: ../../pikotools/src/log/log.h +./dbexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h +./dbexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./dbexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./dbexpression.o: ../../pikotools/src/convert/text.h +./flatconnector.o: flatconnector.h +./flatconnector.o: ../../pikotools/src/textstream/textstream.h +./flatconnector.o: ../../pikotools/src/textstream/stream.h +./flatconnector.o: ../../pikotools/src/space/space.h +./flatconnector.o: ../../pikotools/src/textstream/types.h +./flatconnector.o: ../../pikotools/src/convert/inttostr.h +./flatconnector.o: ../../pikotools/src/utf8/utf8.h +./flatconnector.o: ../../pikotools/src/textstream/stream.h +./flatconnector.o: ../../pikotools/src/utf8/utf8_templates.h +./flatconnector.o: ../../pikotools/src/utf8/utf8_private.h +./flatconnector.o: ../../pikotools/src/date/date.h +./flatconnector.o: ../../pikotools/src/membuffer/membuffer.h +./flatconnector.o: ../../pikotools/src/textstream/types.h +./flatconnector.o: ../../pikotools/src/utf8/utf8_stream.h flatexpression.h +./flatconnector.o: baseexpression.h morm_types.h modelenv.h modeldata.h +./flatconnector.o: cursorhelper.h queryresult.h ../../pikotools/src/log/log.h +./flatconnector.o: ../../pikotools/src/log/filelog.h finderhelper.h +./flatconnector.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./flatconnector.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./flatconnector.o: ../../pikotools/src/convert/text.h model.h +./flatconnector.o: modelconnector.h clearer.h dbconnector.h dbexpression.h +./flatexpression.o: flatexpression.h baseexpression.h +./flatexpression.o: ../../pikotools/src/textstream/textstream.h +./flatexpression.o: ../../pikotools/src/textstream/stream.h +./flatexpression.o: ../../pikotools/src/space/space.h +./flatexpression.o: ../../pikotools/src/textstream/types.h +./flatexpression.o: ../../pikotools/src/convert/inttostr.h +./flatexpression.o: ../../pikotools/src/utf8/utf8.h +./flatexpression.o: ../../pikotools/src/textstream/stream.h +./flatexpression.o: ../../pikotools/src/utf8/utf8_templates.h +./flatexpression.o: ../../pikotools/src/utf8/utf8_private.h +./flatexpression.o: ../../pikotools/src/date/date.h +./flatexpression.o: ../../pikotools/src/membuffer/membuffer.h +./flatexpression.o: ../../pikotools/src/textstream/types.h +./flatexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h +./flatexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h +./flatexpression.o: ../../pikotools/src/log/log.h +./flatexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h +./flatexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./flatexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./flatexpression.o: ../../pikotools/src/convert/text.h +./jsonconnector.o: jsonconnector.h flatconnector.h +./jsonconnector.o: ../../pikotools/src/textstream/textstream.h +./jsonconnector.o: ../../pikotools/src/textstream/stream.h +./jsonconnector.o: ../../pikotools/src/space/space.h +./jsonconnector.o: ../../pikotools/src/textstream/types.h +./jsonconnector.o: ../../pikotools/src/convert/inttostr.h +./jsonconnector.o: ../../pikotools/src/utf8/utf8.h +./jsonconnector.o: ../../pikotools/src/textstream/stream.h +./jsonconnector.o: ../../pikotools/src/utf8/utf8_templates.h +./jsonconnector.o: ../../pikotools/src/utf8/utf8_private.h +./jsonconnector.o: ../../pikotools/src/date/date.h +./jsonconnector.o: ../../pikotools/src/membuffer/membuffer.h +./jsonconnector.o: ../../pikotools/src/textstream/types.h +./jsonconnector.o: ../../pikotools/src/utf8/utf8_stream.h jsonexpression.h +./jsonconnector.o: flatexpression.h baseexpression.h morm_types.h modelenv.h +./jsonconnector.o: modeldata.h cursorhelper.h queryresult.h +./jsonconnector.o: ../../pikotools/src/log/log.h +./jsonconnector.o: ../../pikotools/src/log/filelog.h finderhelper.h +./jsonconnector.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./jsonconnector.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./jsonconnector.o: ../../pikotools/src/convert/text.h +./jsonexpression.o: jsonexpression.h flatexpression.h baseexpression.h +./jsonexpression.o: ../../pikotools/src/textstream/textstream.h +./jsonexpression.o: ../../pikotools/src/textstream/stream.h +./jsonexpression.o: ../../pikotools/src/space/space.h +./jsonexpression.o: ../../pikotools/src/textstream/types.h +./jsonexpression.o: ../../pikotools/src/convert/inttostr.h +./jsonexpression.o: ../../pikotools/src/utf8/utf8.h +./jsonexpression.o: ../../pikotools/src/textstream/stream.h +./jsonexpression.o: ../../pikotools/src/utf8/utf8_templates.h +./jsonexpression.o: ../../pikotools/src/utf8/utf8_private.h +./jsonexpression.o: ../../pikotools/src/date/date.h +./jsonexpression.o: ../../pikotools/src/membuffer/membuffer.h +./jsonexpression.o: ../../pikotools/src/textstream/types.h +./jsonexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h +./jsonexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h +./jsonexpression.o: ../../pikotools/src/log/log.h +./jsonexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h +./jsonexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./jsonexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./jsonexpression.o: ../../pikotools/src/convert/text.h +./jsonexpression.o: ../../pikotools/src/convert/misc.h +./jsonexpression.o: ../../pikotools/src/convert/text.h +./model.o: model.h ../../pikotools/src/textstream/textstream.h +./model.o: ../../pikotools/src/textstream/stream.h +./model.o: ../../pikotools/src/space/space.h +./model.o: ../../pikotools/src/textstream/types.h +./model.o: ../../pikotools/src/convert/inttostr.h +./model.o: ../../pikotools/src/utf8/utf8.h +./model.o: ../../pikotools/src/textstream/stream.h +./model.o: ../../pikotools/src/utf8/utf8_templates.h +./model.o: ../../pikotools/src/utf8/utf8_private.h +./model.o: ../../pikotools/src/date/date.h +./model.o: ../../pikotools/src/membuffer/membuffer.h +./model.o: ../../pikotools/src/textstream/types.h +./model.o: ../../pikotools/src/utf8/utf8_stream.h modelconnector.h clearer.h +./model.o: ft.h dbconnector.h ../../pikotools/src/log/log.h +./model.o: ../../pikotools/src/log/filelog.h queryresult.h flatconnector.h +./model.o: dbexpression.h baseexpression.h morm_types.h modelenv.h +./model.o: modeldata.h cursorhelper.h finderhelper.h fieldvaluehelper.h +./model.o: wrapper.h spacewrapper.h baseobjectwrapper.h +./model.o: modelcontainerwrapper.h ../../pikotools/src/convert/text.h +./model.o: flatexpression.h +./modelconnector.o: modelconnector.h clearer.h +./modelconnector.o: ../../pikotools/src/date/date.h +./modelconnector.o: ../../pikotools/src/convert/inttostr.h +./modelconnector.o: ../../pikotools/src/space/space.h +./modelconnector.o: ../../pikotools/src/textstream/types.h +./modelconnector.o: ../../pikotools/src/utf8/utf8.h +./modelconnector.o: ../../pikotools/src/textstream/stream.h +./modelconnector.o: ../../pikotools/src/utf8/utf8_templates.h +./modelconnector.o: ../../pikotools/src/utf8/utf8_private.h ft.h +./modelconnector.o: dbconnector.h ../../pikotools/src/textstream/textstream.h +./modelconnector.o: ../../pikotools/src/textstream/stream.h +./modelconnector.o: ../../pikotools/src/membuffer/membuffer.h +./modelconnector.o: ../../pikotools/src/textstream/types.h +./modelconnector.o: ../../pikotools/src/utf8/utf8_stream.h +./modelconnector.o: ../../pikotools/src/log/log.h +./modelconnector.o: ../../pikotools/src/log/filelog.h queryresult.h +./modelconnector.o: flatconnector.h +./postgresqlconnector.o: postgresqlconnector.h dbconnector.h +./postgresqlconnector.o: ../../pikotools/src/textstream/textstream.h +./postgresqlconnector.o: ../../pikotools/src/textstream/stream.h +./postgresqlconnector.o: ../../pikotools/src/space/space.h +./postgresqlconnector.o: ../../pikotools/src/textstream/types.h +./postgresqlconnector.o: ../../pikotools/src/convert/inttostr.h +./postgresqlconnector.o: ../../pikotools/src/utf8/utf8.h +./postgresqlconnector.o: ../../pikotools/src/textstream/stream.h +./postgresqlconnector.o: ../../pikotools/src/utf8/utf8_templates.h +./postgresqlconnector.o: ../../pikotools/src/utf8/utf8_private.h +./postgresqlconnector.o: ../../pikotools/src/date/date.h +./postgresqlconnector.o: ../../pikotools/src/membuffer/membuffer.h +./postgresqlconnector.o: ../../pikotools/src/textstream/types.h +./postgresqlconnector.o: ../../pikotools/src/utf8/utf8_stream.h +./postgresqlconnector.o: ../../pikotools/src/log/log.h +./postgresqlconnector.o: ../../pikotools/src/log/filelog.h queryresult.h ft.h +./postgresqlconnector.o: postgresqlqueryresult.h postgresqlexpression.h +./postgresqlconnector.o: dbexpression.h baseexpression.h morm_types.h +./postgresqlconnector.o: modelenv.h modeldata.h cursorhelper.h finderhelper.h +./postgresqlconnector.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./postgresqlconnector.o: baseobjectwrapper.h modelcontainerwrapper.h +./postgresqlconnector.o: ../../pikotools/src/convert/text.h +./postgresqlconnector.o: ../../pikotools/src/convert/strtoint.h +./postgresqlconnector.o: ../../pikotools/src/convert/text.h +./postgresqlconnector.o: ../../pikotools/src/convert/misc.h +./postgresqlexpression.o: postgresqlexpression.h dbexpression.h +./postgresqlexpression.o: baseexpression.h +./postgresqlexpression.o: ../../pikotools/src/textstream/textstream.h +./postgresqlexpression.o: ../../pikotools/src/textstream/stream.h +./postgresqlexpression.o: ../../pikotools/src/space/space.h +./postgresqlexpression.o: ../../pikotools/src/textstream/types.h +./postgresqlexpression.o: ../../pikotools/src/convert/inttostr.h +./postgresqlexpression.o: ../../pikotools/src/utf8/utf8.h +./postgresqlexpression.o: ../../pikotools/src/textstream/stream.h +./postgresqlexpression.o: ../../pikotools/src/utf8/utf8_templates.h +./postgresqlexpression.o: ../../pikotools/src/utf8/utf8_private.h +./postgresqlexpression.o: ../../pikotools/src/date/date.h +./postgresqlexpression.o: ../../pikotools/src/membuffer/membuffer.h +./postgresqlexpression.o: ../../pikotools/src/textstream/types.h +./postgresqlexpression.o: ../../pikotools/src/utf8/utf8_stream.h morm_types.h +./postgresqlexpression.o: modelenv.h modeldata.h cursorhelper.h queryresult.h +./postgresqlexpression.o: ../../pikotools/src/log/log.h +./postgresqlexpression.o: ../../pikotools/src/log/filelog.h finderhelper.h +./postgresqlexpression.o: fieldvaluehelper.h wrapper.h spacewrapper.h +./postgresqlexpression.o: baseobjectwrapper.h modelcontainerwrapper.h ft.h +./postgresqlexpression.o: ../../pikotools/src/convert/text.h +./postgresqlqueryresult.o: postgresqlqueryresult.h queryresult.h +./postgresqlqueryresult.o: ../../pikotools/src/log/log.h +./postgresqlqueryresult.o: ../../pikotools/src/textstream/textstream.h +./postgresqlqueryresult.o: ../../pikotools/src/textstream/stream.h +./postgresqlqueryresult.o: ../../pikotools/src/space/space.h +./postgresqlqueryresult.o: ../../pikotools/src/textstream/types.h +./postgresqlqueryresult.o: ../../pikotools/src/convert/inttostr.h +./postgresqlqueryresult.o: ../../pikotools/src/utf8/utf8.h +./postgresqlqueryresult.o: ../../pikotools/src/textstream/stream.h +./postgresqlqueryresult.o: ../../pikotools/src/utf8/utf8_templates.h +./postgresqlqueryresult.o: ../../pikotools/src/utf8/utf8_private.h +./postgresqlqueryresult.o: ../../pikotools/src/date/date.h +./postgresqlqueryresult.o: ../../pikotools/src/membuffer/membuffer.h +./postgresqlqueryresult.o: ../../pikotools/src/textstream/types.h +./postgresqlqueryresult.o: ../../pikotools/src/utf8/utf8_stream.h +./postgresqlqueryresult.o: ../../pikotools/src/log/filelog.h +./queryresult.o: queryresult.h ../../pikotools/src/log/log.h +./queryresult.o: ../../pikotools/src/textstream/textstream.h +./queryresult.o: ../../pikotools/src/textstream/stream.h +./queryresult.o: ../../pikotools/src/space/space.h +./queryresult.o: ../../pikotools/src/textstream/types.h +./queryresult.o: ../../pikotools/src/convert/inttostr.h +./queryresult.o: ../../pikotools/src/utf8/utf8.h +./queryresult.o: ../../pikotools/src/textstream/stream.h +./queryresult.o: ../../pikotools/src/utf8/utf8_templates.h +./queryresult.o: ../../pikotools/src/utf8/utf8_private.h +./queryresult.o: ../../pikotools/src/date/date.h +./queryresult.o: ../../pikotools/src/membuffer/membuffer.h +./queryresult.o: ../../pikotools/src/textstream/types.h +./queryresult.o: ../../pikotools/src/utf8/utf8_stream.h +./queryresult.o: ../../pikotools/src/log/filelog.h +./transaction.o: transaction.h ../../pikotools/src/log/log.h +./transaction.o: ../../pikotools/src/textstream/textstream.h +./transaction.o: ../../pikotools/src/textstream/stream.h +./transaction.o: ../../pikotools/src/space/space.h +./transaction.o: ../../pikotools/src/textstream/types.h +./transaction.o: ../../pikotools/src/convert/inttostr.h +./transaction.o: ../../pikotools/src/utf8/utf8.h +./transaction.o: ../../pikotools/src/textstream/stream.h +./transaction.o: ../../pikotools/src/utf8/utf8_templates.h +./transaction.o: ../../pikotools/src/utf8/utf8_private.h +./transaction.o: ../../pikotools/src/date/date.h +./transaction.o: ../../pikotools/src/membuffer/membuffer.h +./transaction.o: ../../pikotools/src/textstream/types.h +./transaction.o: ../../pikotools/src/utf8/utf8_stream.h +./transaction.o: ../../pikotools/src/log/filelog.h modelconnector.h clearer.h +./transaction.o: ft.h dbconnector.h queryresult.h flatconnector.h diff --git a/src/Makefile.o.dep b/src/Makefile.o.dep deleted file mode 100644 index 036238d..0000000 --- a/src/Makefile.o.dep +++ /dev/null @@ -1 +0,0 @@ -o = baseexpression.o clearer.o dbconnector.o dbexpression.o flatconnector.o flatexpression.o jsonconnector.o jsonexpression.o model.o modelconnector.o postgresqlconnector.o postgresqlexpression.o postgresqlqueryresult.o queryresult.o transaction.o \ No newline at end of file