Add -fpermissive to linux standard c++ option define in linux.cf

Remove from individual Imakefiles.

Also, remove '#if 0' block in linux.cf, and remove empty
LinuxMachineDefines. This should be working correctly.  If not, let me
know.

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index fe0ad6b6c68167c65ae9abea2b1415728544c95a..f6a64455d353fe18346d1e62a3f79cb328909228 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -92,7 +92,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define LdCmd                  ld -m elf_i386
 #else
 #define CcCmd                  gcc
-#define CplusplusCmd           g++
+#define CplusplusCmd           g++ 
 #define AsCmd                  as
 #define LdCmd                  ld
 #endif
@@ -151,9 +151,9 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #endif
 #endif
 
-#define LinuxMachineDefines
+XCOMM This is needed for CDE currently
+#define CplusplusStandardDefines StandardDefines -fpermissive
 
-#if 0
 #ifdef i386Architecture
 #define OptimizedCDebugFlags   DefaultGcc2i386Opt
 #define LinuxMachineDefines    -D__i386__
@@ -179,7 +179,6 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
 #endif /* Mc68020Architecture */
-#endif /* 0 */
 
 #define StandardDefines                -Dlinux LinuxMachineDefines LinuxSourceDefines
 

diff --git a/cde/lib/DtSvc/DtCodelibs/Imakefile b/cde/lib/DtSvc/DtCodelibs/Imakefile
index e71e7058beb1946816004bdafb0f1f625a1e402a..fb6ae3d5887a3b5e354ceaf9e831200cc586914b 100644 (file)
--- a/cde/lib/DtSvc/DtCodelibs/Imakefile
+++ b/cde/lib/DtSvc/DtCodelibs/Imakefile
@@ -31,10 +31,6 @@ INCLUDES = -I. -I../include
 CXXEXTRA_DEFINES = -qlanglvl=compat
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = buf.C           filegen.C       mbschr.C \
        pathcollapse.C  shellscan.C     strend.C \
        strhash.C       stringio.C      strtokx.C \

diff --git a/cde/lib/tt/bin/dbck/Imakefile b/cde/lib/tt/bin/dbck/Imakefile
index 4e40451d9d5f07c0f5a41ae7e91e7e950c073585..369be76058b91cc19af6d0b0907cbf1079a0e506 100644 (file)
--- a/cde/lib/tt/bin/dbck/Imakefile
+++ b/cde/lib/tt/bin/dbck/Imakefile
@@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS =  binkey.C        binkey_utils.C  common.C \
         options.C       options_tt.C    prop.C \
         prop_utils.C    spec.C          spec_repair.C \

diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile
index ac61d6191fc51165d293ef1b355ad069b493f782..82ce6b83c7d988bea85bd3c713ff2b1b9e10986d 100644 (file)
--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
+++ b/cde/lib/tt/bin/tt_type_comp/Imakefile
@@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = mp_type_comp.C        mp_types_table.C \
        frozen.mp_types_lex.C frozen.mp_types_gram.C
 

diff --git a/cde/lib/tt/bin/ttdbserverd/Imakefile b/cde/lib/tt/bin/ttdbserverd/Imakefile
index e11b8f0a8f50f731e976da38e55fd49807ec9ab4..8a538c6f830b47a9180e7a966c9076e65d730a22 100644 (file)
--- a/cde/lib/tt/bin/ttdbserverd/Imakefile
+++ b/cde/lib/tt/bin/ttdbserverd/Imakefile
@@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = \
         db_server_functions.C \
         db_server_svc.C \

diff --git a/cde/lib/tt/bin/ttsession/Imakefile b/cde/lib/tt/bin/ttsession/Imakefile
index 13d4ed9a573e0339226fef235fcae0fb4777745d..f7b742512b950385e1466744844cc2941c44f253 100644 (file)
--- a/cde/lib/tt/bin/ttsession/Imakefile
+++ b/cde/lib/tt/bin/ttsession/Imakefile
@@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = mp_server.C
 
 OBJS = mp_server.o

diff --git a/cde/lib/tt/lib/api/c/Imakefile b/cde/lib/tt/lib/api/c/Imakefile
index c62f80254829f4745b591fa157753191121ef22a..76b821eb4fc5b78e2e648f1eeade5df693486007 100644 (file)
--- a/cde/lib/tt/lib/api/c/Imakefile
+++ b/cde/lib/tt/lib/api/c/Imakefile
@@ -21,10 +21,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES = 
 INCLUDES = -I../../../lib
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE! 
  *** Every time a .o is added below it needs to be added to
  *** the lib/tt/lib Imakefile in OBJS and SHARED_OBJS

diff --git a/cde/lib/tt/lib/db/Imakefile b/cde/lib/tt/lib/db/Imakefile
index 279e1670b2812722c596bfd3b0ad84a29320b95b..8f82a8bce3c0872603b9cd6eae347d166d1a660c 100644 (file)
--- a/cde/lib/tt/lib/db/Imakefile
+++ b/cde/lib/tt/lib/db/Imakefile
@@ -19,10 +19,6 @@ DEFINES =
 INCLUDES = -I../../lib
 ISAM_INCLUDES = -I../../mini_isam 
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
  *** Every time a .o is added below it needs to be added to
  *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS

diff --git a/cde/lib/tt/lib/mp/Imakefile b/cde/lib/tt/lib/mp/Imakefile
index 5e126391cea1484f32816193efd6ed231cfc3ae2..ddce718051097461ff5beb0d293c39b48f65c721 100644 (file)
--- a/cde/lib/tt/lib/mp/Imakefile
+++ b/cde/lib/tt/lib/mp/Imakefile
@@ -24,10 +24,6 @@ ISAM_INCLUDES = -I../../mini_isam
 CXXEXTRA_DEFINES = -DCOMPAT_43
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
  *** Every time a .o is added below it needs to be added to
  *** the lib/tt/lib Imakefile in MP_OBJS and SHARED_MP_OBJS

diff --git a/cde/lib/tt/lib/tttk/Imakefile b/cde/lib/tt/lib/tttk/Imakefile
index f5174e44c779e56b784d6ce32c0e183090b09fb8..4271fa8e27475cf1f9bd16b69603cffd183029cf 100644 (file)
--- a/cde/lib/tt/lib/tttk/Imakefile
+++ b/cde/lib/tt/lib/tttk/Imakefile
@@ -21,10 +21,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES =
 INCLUDES = -I../../lib
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
  *** Every time a .o is added below it needs to be added to
  *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS

diff --git a/cde/lib/tt/lib/util/Imakefile b/cde/lib/tt/lib/util/Imakefile
index dfcc740be344a091ac868fa5aca8423cf7cd551d..c6d6856587d8741b10e41391a3e3ab985257133b 100644 (file)
--- a/cde/lib/tt/lib/util/Imakefile
+++ b/cde/lib/tt/lib/util/Imakefile
@@ -23,10 +23,6 @@ INCLUDES = -I../../lib
 CXXEXTRA_DEFINES = -D_ILS_MACROS
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
  *** Every time a .o is added below it needs to be added to
  *** the lib/tt/lib Imakefile in UTIL_OBJS and SHARED_UTIL_OBJS

diff --git a/cde/lib/tt/slib/Imakefile b/cde/lib/tt/slib/Imakefile
index cbbc660c36f72cbc6ce846e4288b8a14425e59a8..86c180f7cb73d1480e0cc5da8fa6ebb17078f0e3 100644 (file)
--- a/cde/lib/tt/slib/Imakefile
+++ b/cde/lib/tt/slib/Imakefile
@@ -17,10 +17,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES = 
 INCLUDES = -I. -I../lib
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = \
 mp_ce_attrs.C          mp_observer.C              mp_observer_utils.C  \
 mp_otype.C             mp_otype_utils.C           mp_ptype.C           \

diff --git a/cde/programs/dtmail/MotifApp/Imakefile b/cde/programs/dtmail/MotifApp/Imakefile
index 5c2c296bcd36e7a8afa9b16512a717f10eff0d59..cdf849e73dd429b4e5a7133e75a370d4fcb7fe84 100644 (file)
--- a/cde/programs/dtmail/MotifApp/Imakefile
+++ b/cde/programs/dtmail/MotifApp/Imakefile
@@ -34,11 +34,6 @@ EXTRA_C++OPTIONS =     -xF +p +w $(SPRO_V3_OPTIONS)
 
 #endif /* SunArchitecture */
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
-
 HEADERS = 
 
 SRCS = \

diff --git a/cde/programs/dtmail/dtmail/Imakefile b/cde/programs/dtmail/dtmail/Imakefile
index 5eabe87b2c57b3a6bb6f908dee3ec065607a0782..210abd55e76477d0921ed781da4910c1c1e76b02 100644 (file)
--- a/cde/programs/dtmail/dtmail/Imakefile
+++ b/cde/programs/dtmail/dtmail/Imakefile
@@ -16,10 +16,6 @@ DEFINES = -DRELEASE_NOTES -DDTMAIL_TOOLTALK -DDTEDITOR DtMailDefines
 DEPLIBS = ../MotifApp/libMotifApp.a ../libDtMail/libDtMail.a DepDtClientLibs
 LOCAL_LIBRARIES = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a DtClientLibs
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /* Sun needs the widechar library */
 #ifdef SunArchitecture
 SYS_LIBRARIES =        $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lw -lm

diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile
index 7765d65daaaafd601ed7e5cd2fa3a022fb092105..a980e4fd6e8a260f7a9cd7788b958df03cee565a 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/Imakefile
+++ b/cde/programs/dtmail/dtmailpr/Imakefile
@@ -40,10 +40,6 @@ MT_LIBS              =       -i $(C++_LIB)  -lm -lw -lc
 SYS_LIBRARIES  =       -lintl -lnsl $(MT_LIBS) -lC
 #endif /* SunArchitecture */
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
- 
 SRCS = main.C message.C mailbox.C utils.C
 OBJS = main.o message.o mailbox.o utils.o
 

diff --git a/cde/programs/dtmail/libDtMail/Common/Imakefile b/cde/programs/dtmail/libDtMail/Common/Imakefile
index 59881aac8e50309725eacc1559007ca006b9a9ff..f5b308320c4e9b62e5a6a6fd2e875a500c2a27ab 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Imakefile
+++ b/cde/programs/dtmail/libDtMail/Common/Imakefile
@@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
 #else

diff --git a/cde/programs/dtmail/libDtMail/RFC/Imakefile b/cde/programs/dtmail/libDtMail/RFC/Imakefile
index c4ac453df2c69519d439c083482ed9742a133aa7..2b0ca1957dbb14e258aa66458e3201ab62ded1ed 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/Imakefile
+++ b/cde/programs/dtmail/libDtMail/RFC/Imakefile
@@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 
 INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
 #else

diff --git a/cde/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile
index f948d31642e7e1ff48d0a9b1b28bc2d99f9fccfd..ed42f6e511993e5fcbcd09767fbddf034d98fce5 100644 (file)
--- a/cde/programs/dtprintinfo/Imakefile
+++ b/cde/programs/dtprintinfo/Imakefile
@@ -23,10 +23,6 @@ all:: $(DTPRINTINFO_GEN)
 .NO_PARALLEL:
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \
        -I./objects -I./objects/PrintObj
 

diff --git a/cde/programs/dtprintinfo/UI/Imakefile b/cde/programs/dtprintinfo/UI/Imakefile
index f92fd52b13c86898a1e5871950dfb225ae8c4c2e..44fc8028d5bc6a8e3e593c0740f378feb70aac4d 100644 (file)
--- a/cde/programs/dtprintinfo/UI/Imakefile
+++ b/cde/programs/dtprintinfo/UI/Imakefile
@@ -16,11 +16,6 @@ INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../ob
 DEFINES = -DHAS_EXCEPTIONS
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
-
 SRCS =         DtActions.C     DtApp.C         DtDetailsLabel.C \
        DtFindD.C       DtFindSet.C     DtMainW.C \
        DtPrinterIcon.C DtProps.C       DtPrtJobIcon.C \

diff --git a/cde/programs/dtsearchpath/libCliSrv/Imakefile b/cde/programs/dtsearchpath/libCliSrv/Imakefile
index 637c0c57ac9d5f3d7bf2790f6b8b708769e55476..83cd42f1ecf6b2917546e3421ad45399f7d5def1 100644 (file)
--- a/cde/programs/dtsearchpath/libCliSrv/Imakefile
+++ b/cde/programs/dtsearchpath/libCliSrv/Imakefile
@@ -22,10 +22,6 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS
 EXTRA_DEFINES = -DIOSTREAMSWORKS
 #endif
 
-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = DirIterator.C   Environ.C       TTFile.C \
        UnixEnv.C       cstring.C
 

diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 166bb666e27187d7484813b5dc3291cf6e62fc24..e44e352b433b6661184f05510745e7e5b64bb3ef 100644 (file)
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -77,7 +77,7 @@ STLIBCENV =
 M4 = /bin/m4
 #endif
 
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture(
 
 /*
  * put cpp directives here rather than in CXXDEFINES because
@@ -95,8 +95,6 @@ CXXTEMPLATEFLAGS =
 
 M4 = /usr/bin/m4
 
-CXXEXTRA_DEFINES = -fpermissive
-
 #endif
 
 #if defined(RsArchitecture)