makefile fixes for compilation with gcc32

4 files changed, 21 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 0b8997e..6a8521f 100644
--- a/Makefile
+++ b/Makefile
@@ -78,2 +78,5 @@ build_microkde: variable_test tmake
 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; \
@@ -81,2 +84,3 @@ build_qtopia_plugin: build_microkde
           done
+  endif
 
@@ -90,3 +94,3 @@ build_opie_plugin: build_microkde
   endif
-  
+
 build_sharp_plugin: build_microkde
@@ -150,2 +154,3 @@ variable_info:
         @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)
@@ -174,2 +179,5 @@ variable_test: variable_info
   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
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 0b8997e..6a8521f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -78,2 +78,5 @@ build_microkde: variable_test tmake
 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; \
@@ -81,2 +84,3 @@ build_qtopia_plugin: build_microkde
           done
+  endif
 
@@ -90,3 +94,3 @@ build_opie_plugin: build_microkde
   endif
-  
+
 build_sharp_plugin: build_microkde
@@ -150,2 +154,3 @@ variable_info:
         @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)
@@ -174,2 +179,5 @@ variable_test: variable_info
   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
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 75ba92f..d578a9c 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -63,2 +63,4 @@ LIBS += $(QTOPIALIB)
 
+LIBS += $(GCC3EXTRALIB1)
+LIBS += $(GCC3EXTRALIB2)
 #
diff --git a/setZaurus3 b/setZaurus3
index 2649292..5d1fe7b 100755
--- a/setZaurus3
+++ b/setZaurus3
@@ -12,2 +12,3 @@ export BUILD_NO_QTOPIA_PLUGIN=1
 export BUILD_NO_SHARP_PLUGIN=1
+export BUILD_NO_LDAP_PLUGIN=1
 #export BUILD_NO_GAMMU=1