From afb21584fdb4dcc201fca13b4c5129fdf2e90154 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Thu, 12 Aug 2004 17:09:11 +0000 Subject: implemented new include strategy for makefiles --- diff --git a/Makefile.Embedded b/Makefile.Embedded index 38fd000..9b55ecf 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -1,5 +1,4 @@ -DISTPATH = $(shell pwd) -DISTDIR = $(shell basename $(DISTPATH)) +export KDEPIMDIR = $(shell pwd) ifeq ($(PLATFORM) , zaurus) @@ -110,6 +109,7 @@ build_micromail: build_microkde variable_info: @echo -------------------------------------- @echo KDEPIM buildsystem, variableinfo... + @echo KDEPIMDIR=$(KDEPIMDIR) @echo QTDIR=$(QTDIR) @echo QPEDIR=$(QPEDIR) @echo OPIEDIR=$(OPIEDIR) @@ -126,6 +126,10 @@ variable_info: variable_test: variable_info @echo KDEPIM buildsystem, variablecheck... + ifndef KDEPIMDIR + @echo KDEPIMDIR is not defined. + $(error KDEPIMDIR is not defined) + endif ifndef PLATFORM @echo PLATFORM is not defined. $(error PLATFORM is not defined) @@ -156,7 +160,7 @@ objects: mkdir -p libical/lib/$(PLATFORM) clean: - rm -f libical/lib/$(PLATFORM)/*; + rm -rf libical/lib/$(PLATFORM)/*; for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ done diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..71087aa 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro @@ -7,7 +7,7 @@ TARGET = microkabc include( ../variables.pri ) -INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui .. +INCLUDEPATH += . vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdeui #LIBS += -lmicrokde -lldap LIBS += -L$(QPEDIR)/lib diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 62a66eb..dfdbcff 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro @@ -3,7 +3,7 @@ CONFIG += qt warn_on TARGET = microkabc -INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include +INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index fec2341..7e9752d 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -6,7 +6,7 @@ DESTDIR= ../bin include( ../variables.pri ) -INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces +INCLUDEPATH += . details features xxport $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kutils $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/kabc $(KDEPIMDIR) interfaces DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION unix : { diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro index 962f788..c026808 100644 --- a/kmicromail/kmicromailE.pro +++ b/kmicromail/kmicromailE.pro @@ -50,7 +50,7 @@ INTERFACES = editaccountsui.ui \ nntpgroupsui.ui -INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat +INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim LIBS += $(QTOPIALIB) #LIBS += -lqtopia diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index e501d88..ca69e14 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -7,7 +7,7 @@ DESTDIR= ../bin include( ../variables.pri ) -INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio +INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio #../qtcompat DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index b39de35..16c27d1 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro @@ -5,8 +5,8 @@ OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR=$(QPEDIR)/bin -INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include -#../libkabcwrap +INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include + DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER DEFINES += KORG_NOLVALTERNATION @@ -16,7 +16,6 @@ LIBS += -lmicrokcal LIBS += -lmicrokde LIBS += -lmicroqtcompat LIBS += -lmicrokabc -#LIBS += -lmicrokabcwrap #LIBS += $(QPEDIR)/lib/gammu LIBS += -lmicrogammu diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro index d02f080..95dd611 100644 --- a/libkcal/libkcal.pro +++ b/libkcal/libkcal.pro @@ -4,8 +4,8 @@ TARGET = microkcal include( ../variables.pri ) -INCLUDEPATH += ../microkde versit ../microkde/kdecore -#../qtcompat +INCLUDEPATH += $(KDEPIMDIR)/microkde versit $(KDEPIMDIR)/microkde/kdecore + INCLUDEPATH += ../libical/src/libical INCLUDEPATH += ../libical/src/libicalss DESTDIR = ../bin diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index 027cb98..4ebc802 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -23,7 +23,7 @@ #ifndef KPIM_CATEGORYEDITDIALOG_H #define KPIM_CATEGORYEDITDIALOG_H -#include +#include class KPimPrefs; diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 943d35c..40b46cf 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -28,7 +28,7 @@ #include -#include +#include "categoryeditdialog.h" #include "categoryselectdialog.h" #include "kpimprefs.h" diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index 8507dc4..9b6261c 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -23,7 +23,7 @@ #ifndef KPIM_CATEGORYSELECTDIALOG_H #define KPIM_CATEGORYSELECTDIALOG_H -#include +#include class KPimPrefs; diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 060145e..d1d52a4 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG = qt warn_on DEFINES +=KORG_NOKABC TARGET = microkdepim -INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. +INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui DESTDIR=../bin DEFINES += DESKTOP_VERSION diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index 196044b..b455a3e 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro @@ -1,8 +1,7 @@ TEMPLATE = lib CONFIG += qt warn_on TARGET = microkdepim -INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include -INCLUDEPATH += . .. +INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include LIBS += -lmicrokde LIBS += -lmicrokcal LIBS += -L$(QPEDIR)/lib diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 71d662b..f132e9a 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro @@ -1,9 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on -#INCLUDEPATH += $(QTDIR)/include . -#DEPENDPATH += $(QTDIR)/include -INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio -#LIBS += -lqtcompat +INCLUDEPATH += . $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio TARGET = microkde DESTDIR= ../bin diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro index fc80c03..df914ce 100644 --- a/microkde/microkdeE.pro +++ b/microkde/microkdeE.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on -INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include +INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include DEPENDPATH += $(QPEDIR)/include LIBS += -lmicroqtcompat -L$(QPEDIR)/lib -- cgit v0.9.0.2