From 41684eb969d70dc08464b985af3b3e2cb5741af3 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 7 Jan 2019 04:33:31 +0000 Subject: [PATCH] Makefile.dep git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1165 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/Makefile.dep | 74 +++++++++++---------------------------------- src/dbconnector.cpp | 1 + 2 files changed, 19 insertions(+), 56 deletions(-) diff --git a/src/Makefile.dep b/src/Makefile.dep index 71edde4..e8ab432 100644 --- a/src/Makefile.dep +++ b/src/Makefile.dep @@ -4,11 +4,7 @@ baseexpression.o: baseexpression.h ../../pikotools/textstream/textstream.h baseexpression.o: ../../pikotools/space/space.h baseexpression.o: ../../pikotools/textstream/types.h baseexpression.o: ../../pikotools/date/date.h -baseexpression.o: ../../pikotools/convert/convert.h baseexpression.o: ../../pikotools/convert/inttostr.h -baseexpression.o: ../../pikotools/convert/strtoint.h -baseexpression.o: ../../pikotools/convert/text.h -baseexpression.o: ../../pikotools/convert/misc.h baseexpression.o: ../../pikotools/membuffer/membuffer.h baseexpression.o: ../../pikotools/textstream/types.h morm_types.h model.h baseexpression.o: modelconnector.h clearer.h dbconnector.h @@ -16,10 +12,7 @@ baseexpression.o: ../../pikotools/log/log.h ../../pikotools/log/filelog.h baseexpression.o: queryresult.h flatconnector.h dbexpression.h baseexpression.o: flatexpression.h ../../pikotools/utf8/utf8.h clearer.o: clearer.h ../../pikotools/date/date.h -clearer.o: ../../pikotools/convert/convert.h -clearer.o: ../../pikotools/convert/inttostr.h -clearer.o: ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.h -clearer.o: ../../pikotools/convert/misc.h model.h +clearer.o: ../../pikotools/convert/inttostr.h model.h clearer.o: ../../pikotools/textstream/textstream.h clearer.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h clearer.o: ../../pikotools/membuffer/membuffer.h @@ -30,24 +23,23 @@ clearer.o: morm_types.h flatexpression.h dbconnector.o: dbconnector.h ../../pikotools/textstream/textstream.h dbconnector.o: ../../pikotools/space/space.h dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h -dbconnector.o: ../../pikotools/convert/convert.h dbconnector.o: ../../pikotools/convert/inttostr.h -dbconnector.o: ../../pikotools/convert/strtoint.h -dbconnector.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h dbconnector.o: ../../pikotools/membuffer/membuffer.h dbconnector.o: ../../pikotools/textstream/types.h ../../pikotools/log/log.h dbconnector.o: ../../pikotools/log/filelog.h queryresult.h dbexpression.h dbconnector.o: baseexpression.h morm_types.h model.h modelconnector.h dbconnector.o: clearer.h flatconnector.h flatexpression.h -dbconnector.o: ../../pikotools/utf8/utf8.h +dbconnector.o: ../../pikotools/utf8/utf8.h ../../pikotools/convert/convert.h +dbconnector.o: ../../pikotools/convert/inttostr.h +dbconnector.o: ../../pikotools/convert/patternreplacer.h +dbconnector.o: ../../pikotools/convert/strtoint.h +dbconnector.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h dbexpression.o: dbexpression.h baseexpression.h dbexpression.o: ../../pikotools/textstream/textstream.h dbexpression.o: ../../pikotools/space/space.h dbexpression.o: ../../pikotools/textstream/types.h -dbexpression.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h +dbexpression.o: ../../pikotools/date/date.h dbexpression.o: ../../pikotools/convert/inttostr.h -dbexpression.o: ../../pikotools/convert/strtoint.h -dbexpression.o: ../../pikotools/convert/text.h ../../pikotools/convert/misc.h dbexpression.o: ../../pikotools/membuffer/membuffer.h dbexpression.o: ../../pikotools/textstream/types.h morm_types.h dochtmlconnector.o: dochtmlconnector.h flatconnector.h @@ -55,11 +47,7 @@ dochtmlconnector.o: ../../pikotools/textstream/textstream.h dochtmlconnector.o: ../../pikotools/space/space.h dochtmlconnector.o: ../../pikotools/textstream/types.h dochtmlconnector.o: ../../pikotools/date/date.h -dochtmlconnector.o: ../../pikotools/convert/convert.h dochtmlconnector.o: ../../pikotools/convert/inttostr.h -dochtmlconnector.o: ../../pikotools/convert/strtoint.h -dochtmlconnector.o: ../../pikotools/convert/text.h -dochtmlconnector.o: ../../pikotools/convert/misc.h dochtmlconnector.o: ../../pikotools/membuffer/membuffer.h dochtmlconnector.o: ../../pikotools/textstream/types.h dochtmlexpression.h dochtmlconnector.o: flatexpression.h baseexpression.h morm_types.h @@ -68,22 +56,14 @@ dochtmlexpression.o: ../../pikotools/textstream/textstream.h dochtmlexpression.o: ../../pikotools/space/space.h dochtmlexpression.o: ../../pikotools/textstream/types.h dochtmlexpression.o: ../../pikotools/date/date.h -dochtmlexpression.o: ../../pikotools/convert/convert.h dochtmlexpression.o: ../../pikotools/convert/inttostr.h -dochtmlexpression.o: ../../pikotools/convert/strtoint.h -dochtmlexpression.o: ../../pikotools/convert/text.h -dochtmlexpression.o: ../../pikotools/convert/misc.h dochtmlexpression.o: ../../pikotools/membuffer/membuffer.h dochtmlexpression.o: ../../pikotools/textstream/types.h morm_types.h flatconnector.o: flatconnector.h ../../pikotools/textstream/textstream.h flatconnector.o: ../../pikotools/space/space.h flatconnector.o: ../../pikotools/textstream/types.h flatconnector.o: ../../pikotools/date/date.h -flatconnector.o: ../../pikotools/convert/convert.h flatconnector.o: ../../pikotools/convert/inttostr.h -flatconnector.o: ../../pikotools/convert/strtoint.h -flatconnector.o: ../../pikotools/convert/text.h -flatconnector.o: ../../pikotools/convert/misc.h flatconnector.o: ../../pikotools/membuffer/membuffer.h flatconnector.o: ../../pikotools/textstream/types.h flatexpression.h flatconnector.o: baseexpression.h morm_types.h model.h modelconnector.h @@ -94,11 +74,7 @@ flatexpression.o: ../../pikotools/textstream/textstream.h flatexpression.o: ../../pikotools/space/space.h flatexpression.o: ../../pikotools/textstream/types.h flatexpression.o: ../../pikotools/date/date.h -flatexpression.o: ../../pikotools/convert/convert.h flatexpression.o: ../../pikotools/convert/inttostr.h -flatexpression.o: ../../pikotools/convert/strtoint.h -flatexpression.o: ../../pikotools/convert/text.h -flatexpression.o: ../../pikotools/convert/misc.h flatexpression.o: ../../pikotools/membuffer/membuffer.h flatexpression.o: ../../pikotools/textstream/types.h morm_types.h jsonconnector.o: jsonconnector.h flatconnector.h @@ -106,11 +82,7 @@ jsonconnector.o: ../../pikotools/textstream/textstream.h jsonconnector.o: ../../pikotools/space/space.h jsonconnector.o: ../../pikotools/textstream/types.h jsonconnector.o: ../../pikotools/date/date.h -jsonconnector.o: ../../pikotools/convert/convert.h jsonconnector.o: ../../pikotools/convert/inttostr.h -jsonconnector.o: ../../pikotools/convert/strtoint.h -jsonconnector.o: ../../pikotools/convert/text.h -jsonconnector.o: ../../pikotools/convert/misc.h jsonconnector.o: ../../pikotools/membuffer/membuffer.h jsonconnector.o: ../../pikotools/textstream/types.h jsonexpression.h jsonconnector.o: flatexpression.h baseexpression.h morm_types.h @@ -119,29 +91,19 @@ jsonexpression.o: ../../pikotools/textstream/textstream.h jsonexpression.o: ../../pikotools/space/space.h jsonexpression.o: ../../pikotools/textstream/types.h jsonexpression.o: ../../pikotools/date/date.h -jsonexpression.o: ../../pikotools/convert/convert.h jsonexpression.o: ../../pikotools/convert/inttostr.h -jsonexpression.o: ../../pikotools/convert/strtoint.h -jsonexpression.o: ../../pikotools/convert/text.h -jsonexpression.o: ../../pikotools/convert/misc.h jsonexpression.o: ../../pikotools/membuffer/membuffer.h jsonexpression.o: ../../pikotools/textstream/types.h morm_types.h model.o: model.h ../../pikotools/textstream/textstream.h model.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h -model.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h -model.o: ../../pikotools/convert/inttostr.h -model.o: ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.h -model.o: ../../pikotools/convert/misc.h ../../pikotools/membuffer/membuffer.h +model.o: ../../pikotools/date/date.h ../../pikotools/convert/inttostr.h +model.o: ../../pikotools/membuffer/membuffer.h model.o: ../../pikotools/textstream/types.h modelconnector.h clearer.h model.o: dbconnector.h ../../pikotools/log/log.h model.o: ../../pikotools/log/filelog.h queryresult.h flatconnector.h model.o: dbexpression.h baseexpression.h morm_types.h flatexpression.h modelconnector.o: modelconnector.h clearer.h ../../pikotools/date/date.h -modelconnector.o: ../../pikotools/convert/convert.h -modelconnector.o: ../../pikotools/convert/inttostr.h -modelconnector.o: ../../pikotools/convert/strtoint.h -modelconnector.o: ../../pikotools/convert/text.h -modelconnector.o: ../../pikotools/convert/misc.h dbconnector.h +modelconnector.o: ../../pikotools/convert/inttostr.h dbconnector.h modelconnector.o: ../../pikotools/textstream/textstream.h modelconnector.o: ../../pikotools/space/space.h modelconnector.o: ../../pikotools/textstream/types.h @@ -154,11 +116,7 @@ postgresqlconnector.o: ../../pikotools/textstream/textstream.h postgresqlconnector.o: ../../pikotools/space/space.h postgresqlconnector.o: ../../pikotools/textstream/types.h postgresqlconnector.o: ../../pikotools/date/date.h -postgresqlconnector.o: ../../pikotools/convert/convert.h postgresqlconnector.o: ../../pikotools/convert/inttostr.h -postgresqlconnector.o: ../../pikotools/convert/strtoint.h -postgresqlconnector.o: ../../pikotools/convert/text.h -postgresqlconnector.o: ../../pikotools/convert/misc.h postgresqlconnector.o: ../../pikotools/membuffer/membuffer.h postgresqlconnector.o: ../../pikotools/textstream/types.h postgresqlconnector.o: ../../pikotools/log/log.h @@ -166,18 +124,22 @@ postgresqlconnector.o: ../../pikotools/log/filelog.h queryresult.h postgresqlconnector.o: postgresqlqueryresult.h ../../pikotools/utf8/utf8.h postgresqlconnector.o: postgresqlexpression.h dbexpression.h baseexpression.h postgresqlconnector.o: morm_types.h ../../pikotools/convert/strtoint.h +postgresqlconnector.o: ../../pikotools/convert/text.h +postgresqlconnector.o: ../../pikotools/convert/misc.h postgresqlexpression.o: postgresqlexpression.h dbexpression.h postgresqlexpression.o: baseexpression.h postgresqlexpression.o: ../../pikotools/textstream/textstream.h postgresqlexpression.o: ../../pikotools/space/space.h postgresqlexpression.o: ../../pikotools/textstream/types.h postgresqlexpression.o: ../../pikotools/date/date.h -postgresqlexpression.o: ../../pikotools/convert/convert.h postgresqlexpression.o: ../../pikotools/convert/inttostr.h -postgresqlexpression.o: ../../pikotools/convert/strtoint.h -postgresqlexpression.o: ../../pikotools/convert/text.h -postgresqlexpression.o: ../../pikotools/convert/misc.h postgresqlexpression.o: ../../pikotools/membuffer/membuffer.h postgresqlexpression.o: ../../pikotools/textstream/types.h morm_types.h postgresqlqueryresult.o: postgresqlqueryresult.h queryresult.h queryresult.o: queryresult.h ../../pikotools/utf8/utf8.h +queryresult.o: ../../pikotools/textstream/textstream.h +queryresult.o: ../../pikotools/space/space.h +queryresult.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h +queryresult.o: ../../pikotools/convert/inttostr.h +queryresult.o: ../../pikotools/membuffer/membuffer.h +queryresult.o: ../../pikotools/textstream/types.h diff --git a/src/dbconnector.cpp b/src/dbconnector.cpp index 1b7b344..1c5bf27 100644 --- a/src/dbconnector.cpp +++ b/src/dbconnector.cpp @@ -38,6 +38,7 @@ #include "dbexpression.h" #include "model.h" #include "utf8/utf8.h" +#include "convert/convert.h" namespace morm