makefile fixes for compilation with gcc32

4 files changed, 19 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 0b8997e..6a8521f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,35 +63,39 @@ SUBDIRS = \
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
      build_micromail \
      build_gammu \
      build_pwmanager
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo == qtopia plugin not build.
+  else
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
+  endif
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo == opie plugin not build.
   else
 	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
   
 build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
 	@echo == ldap plugin not build.
   else
 	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
@@ -135,56 +139,60 @@ build_pwmanager: build_microkde
           done
   endif
 
 
 variable_info:
 	@echo --------------------------------------
 	@echo KDEPIM buildsystem, variableinfo...
 	@echo KDEPIMDIR=$(KDEPIMDIR)
 	@echo QTDIR=$(QTDIR)
 	@echo QPEDIR=$(QPEDIR)
 	@echo OPIEDIR=$(OPIEDIR)
 	@echo PLATFORM=$(PLATFORM)
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
 	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
 	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+	@echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
 	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
 	@echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
 	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
 	@echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
 	@echo --------------------------------------
 
 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)
   endif
   ifdef BUILD_NO_LDAP_PLUGIN
 	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
   endif
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
   endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
   ifdef BUILD_NO_MICROMAIL
 	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
   endif
   ifdef BUILD_NO_SHARP_PLUGIN
 	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
   else
   ifndef SHARPDTMSDK
 	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
 	$(error SHARPDTMSDK is not defined)
   endif
   endif
   ifdef BUILD_NO_GAMMU
 	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
   endif
   ifdef BUILD_NO_PWMANAGER
 	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 0b8997e..6a8521f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -63,35 +63,39 @@ SUBDIRS = \
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
      build_micromail \
      build_gammu \
      build_pwmanager
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo == qtopia plugin not build.
+  else
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
+  endif
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo == opie plugin not build.
   else
 	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
   
 build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
 	@echo == ldap plugin not build.
   else
 	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
@@ -135,56 +139,60 @@ build_pwmanager: build_microkde
           done
   endif
 
 
 variable_info:
 	@echo --------------------------------------
 	@echo KDEPIM buildsystem, variableinfo...
 	@echo KDEPIMDIR=$(KDEPIMDIR)
 	@echo QTDIR=$(QTDIR)
 	@echo QPEDIR=$(QPEDIR)
 	@echo OPIEDIR=$(OPIEDIR)
 	@echo PLATFORM=$(PLATFORM)
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
 	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
 	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+	@echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
 	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
 	@echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
 	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
 	@echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
 	@echo --------------------------------------
 
 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)
   endif
   ifdef BUILD_NO_LDAP_PLUGIN
 	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
   endif
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
   endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
   ifdef BUILD_NO_MICROMAIL
 	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
   endif
   ifdef BUILD_NO_SHARP_PLUGIN
 	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
   else
   ifndef SHARPDTMSDK
 	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
 	$(error SHARPDTMSDK is not defined)
   endif
   endif
   ifdef BUILD_NO_GAMMU
 	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
   endif
   ifdef BUILD_NO_PWMANAGER
 	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 75ba92f..d578a9c 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -48,23 +48,25 @@ INTERFACES     = editaccountsui.ui \
                smtpconfigui.ui \
                composemailui.ui \
                settingsdialogui.ui \
                statuswidgetui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
 
 
 INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(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 -lmicroqtcompat  -lmicrokdepim
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
 
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 #
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 TARGET       = ompi
 
 
diff --git a/setZaurus3 b/setZaurus3
index 2649292..5d1fe7b 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -1,24 +1,25 @@
 # Settings to compile KDE-Pim/Pi with gcc 3.3.2 cross compiler for Zaurus
 # copy this dir to /opt/Qtopia/examples/
 # Now this file should be in the path  /opt/Qtopia/examples/kdepim/setZaurus3
 # add the following line to ~/.bashrc without leading #
 # alias cz='source /opt/Qtopia/examples/kdepim/setZaurus3'
 # then type in terminal cz3<return> to set the variables
 # for cross-compiling
 export QPEDIR=/opt/Qtopia/sharp3
 export OPIEDIR=/kde_dev/opie
 #export BUILD_NO_OPIE_PLUGIN=1
 export BUILD_NO_QTOPIA_PLUGIN=1
 export BUILD_NO_SHARP_PLUGIN=1
+export BUILD_NO_LDAP_PLUGIN=1
 #export BUILD_NO_GAMMU=1
 export QTDIR=/opt/Qtopia/sharp3
 #insert here path to your gcc 3.3.2 compiler 
 export PATH=$QTDIR/bin:/opt/cross/bin:$PATH
 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
 export PLATFORM=zaurus3
 export RELEASE_DEBUG=release
 export SHARPDTMSDK=/opt/dtm
 #export RELEASE_DEBUG=debug
 export GCC3EXTRALIB1=-lpng12
 export GCC3EXTRALIB2=-lz
 export KDEPIM_VERSION=1.9.5c
\ No newline at end of file