From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 30 Aug 2005 10:06:12 +0000 (+0000)
Subject: fixed PCH opts
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc77908e759777d002bf176001a661d2836287ba;p=sope

fixed PCH opts


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1097 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 1bc92a61..9a730f66 100644
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-30  Helge Hess  <helge.hess@skyrix.com>
+
+	* do not use PCH warning flags with older compilers (v4.5.235)
+
 2005-08-27  Helge Hess  <helge.hess@opengroupware.org>
 
 	* added some PCH support (v4.5.234)
diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble
index 6fe0f4bb..7181ae94 100644
--- a/sope-mime/GNUmakefile.preamble
+++ b/sope-mime/GNUmakefile.preamble
@@ -6,7 +6,10 @@ ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
 		       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
 		       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
 
-ADDITIONAL_CPPFLAGS += -Wall -Winvalid-pch
+ADDITIONAL_CPPFLAGS += -Wall
+ifeq ($(PRECOMPILED_HEADERS),yes)
+ADDITIONAL_CPPFLAGS += -Winvalid-pch
+endif
 
 libNGMime_INCLUDE_DIRS += \
 	-I$(SOPE_ROOT)	\
diff --git a/sope-mime/NGImap4/GNUmakefile.preamble b/sope-mime/NGImap4/GNUmakefile.preamble
index a3853c83..de76ae7b 100644
--- a/sope-mime/NGImap4/GNUmakefile.preamble
+++ b/sope-mime/NGImap4/GNUmakefile.preamble
@@ -2,7 +2,10 @@
 
 SOPE_ROOT=../..
 
-ADDITIONAL_CPPFLAGS += -Wall -Winvalid-pch
+ADDITIONAL_CPPFLAGS += -Wall
+ifeq ($(PRECOMPILED_HEADERS),yes)
+ADDITIONAL_CPPFLAGS += -Winvalid-pch
+endif
 
 NGImap4_INCLUDE_DIRS += \
 	-I.. -I$(SOPE_ROOT)			\
diff --git a/sope-mime/NGMail/GNUmakefile.preamble b/sope-mime/NGMail/GNUmakefile.preamble
index f7a35b5f..98eda503 100644
--- a/sope-mime/NGMail/GNUmakefile.preamble
+++ b/sope-mime/NGMail/GNUmakefile.preamble
@@ -2,7 +2,10 @@
 
 SOPE_ROOT=../..
 
-ADDITIONAL_CPPFLAGS += -Wall -Winvalid-pch
+ADDITIONAL_CPPFLAGS += -Wall
+ifeq ($(PRECOMPILED_HEADERS),yes)
+ADDITIONAL_CPPFLAGS += -Winvalid-pch
+endif
 
 NGMail_INCLUDE_DIRS += \
 	-I.. -I$(SOPE_ROOT)			\
diff --git a/sope-mime/NGMime/GNUmakefile.preamble b/sope-mime/NGMime/GNUmakefile.preamble
index 1c626b38..ca00bde1 100644
--- a/sope-mime/NGMime/GNUmakefile.preamble
+++ b/sope-mime/NGMime/GNUmakefile.preamble
@@ -1,16 +1,12 @@
 # compilation settings
 
-ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
-		       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-		       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
+ADDITIONAL_CPPFLAGS += \
+        -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+	-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+	-DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
 
 NGMime_INCLUDE_DIRS += \
 	-I.. -I../..			\
 	-I../../sope-core/NGStreams/	\
 	-I../../sope-core/NGExtensions/	\
 	-I../../sope-core
-
-ADDITIONAL_CPPFLAGS += \
-	-DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
-	-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
-	-DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION}
diff --git a/sope-mime/Version b/sope-mime/Version
index e4d930b3..209641ab 100644
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=234
+SUBMINOR_VERSION:=235
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34