From: Peter Howkins Date: Thu, 31 May 2012 11:41:33 +0000 (+0100) Subject: Modify all Imakefile files to use LinuxArchitecture instead of LinuxDistribution X-Git-Tag: 2.2.0a~26^2~29 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=837972cb6982f2aa97f664d7d913060a261d4248;p=oweals%2Fcde.git Modify all Imakefile files to use LinuxArchitecture instead of LinuxDistribution for Linux specific changes. (lib directory) --- diff --git a/cde/lib/DtSvc/DtCodelibs/Imakefile b/cde/lib/DtSvc/DtCodelibs/Imakefile index dbacb258..e71e7058 100644 --- a/cde/lib/DtSvc/DtCodelibs/Imakefile +++ b/cde/lib/DtSvc/DtCodelibs/Imakefile @@ -31,7 +31,7 @@ INCLUDES = -I. -I../include CXXEXTRA_DEFINES = -qlanglvl=compat #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/DtWidget/Imakefile b/cde/lib/DtWidget/Imakefile index 6430617c..67e2a417 100644 --- a/cde/lib/DtWidget/Imakefile +++ b/cde/lib/DtWidget/Imakefile @@ -13,7 +13,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $ # define DtWidgetDefines -DI18N_MSG -DXK_MISCELLANY -DMULTIBYTE #endif DEFINES = DtWidgetDefines -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) INCLUDES = -I. -I/usr/include/freetype2 #else INCLUDES = -I. diff --git a/cde/lib/tt/bin/dbck/Imakefile b/cde/lib/tt/bin/dbck/Imakefile index f67c3298..4e40451d 100644 --- a/cde/lib/tt/bin/dbck/Imakefile +++ b/cde/lib/tt/bin/dbck/Imakefile @@ -19,7 +19,7 @@ SYS_LIBRARIES = EXTRA_LIBRARIES = TtClientExtraLibs #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile index b43d8562..ac61d619 100644 --- a/cde/lib/tt/bin/tt_type_comp/Imakefile +++ b/cde/lib/tt/bin/tt_type_comp/Imakefile @@ -19,7 +19,7 @@ SYS_LIBRARIES = EXTRA_LIBRARIES = TtClientExtraLibs #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/bin/ttauth/Imakefile b/cde/lib/tt/bin/ttauth/Imakefile index 57396e3b..66583b96 100644 --- a/cde/lib/tt/bin/ttauth/Imakefile +++ b/cde/lib/tt/bin/ttauth/Imakefile @@ -9,7 +9,7 @@ INCLUDES = -I. -I../../slib -I../../lib XCOMM On Linux once you link against a C++ library the whole program XCOMM has to be linked with the C++ linker -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CCLINK = $(CXX) #endif diff --git a/cde/lib/tt/bin/ttdbserverd/Imakefile b/cde/lib/tt/bin/ttdbserverd/Imakefile index 92e67d76..e11b8f0a 100644 --- a/cde/lib/tt/bin/ttdbserverd/Imakefile +++ b/cde/lib/tt/bin/ttdbserverd/Imakefile @@ -19,7 +19,7 @@ SYS_LIBRARIES = EXTRA_LIBRARIES = TtClientExtraLibs #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/bin/ttsession/Imakefile b/cde/lib/tt/bin/ttsession/Imakefile index 7d26e616..13d4ed9a 100644 --- a/cde/lib/tt/bin/ttsession/Imakefile +++ b/cde/lib/tt/bin/ttsession/Imakefile @@ -19,7 +19,7 @@ SYS_LIBRARIES = EXTRA_LIBRARIES = TtClientExtraLibs #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/lib/api/c/Imakefile b/cde/lib/tt/lib/api/c/Imakefile index 7488a268..c62f8025 100644 --- a/cde/lib/tt/lib/api/c/Imakefile +++ b/cde/lib/tt/lib/api/c/Imakefile @@ -21,7 +21,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEFINES = INCLUDES = -I../../../lib -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/lib/db/Imakefile b/cde/lib/tt/lib/db/Imakefile index 2f17ce0f..279e1670 100644 --- a/cde/lib/tt/lib/db/Imakefile +++ b/cde/lib/tt/lib/db/Imakefile @@ -19,7 +19,7 @@ DEFINES = INCLUDES = -I../../lib ISAM_INCLUDES = -I../../mini_isam -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/lib/mp/Imakefile b/cde/lib/tt/lib/mp/Imakefile index 870ee6e7..5e126391 100644 --- a/cde/lib/tt/lib/mp/Imakefile +++ b/cde/lib/tt/lib/mp/Imakefile @@ -24,7 +24,7 @@ ISAM_INCLUDES = -I../../mini_isam CXXEXTRA_DEFINES = -DCOMPAT_43 #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/lib/tttk/Imakefile b/cde/lib/tt/lib/tttk/Imakefile index 8001eb38..f5174e44 100644 --- a/cde/lib/tt/lib/tttk/Imakefile +++ b/cde/lib/tt/lib/tttk/Imakefile @@ -21,7 +21,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEFINES = INCLUDES = -I../../lib -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/lib/util/Imakefile b/cde/lib/tt/lib/util/Imakefile index 90c74603..dfcc740b 100644 --- a/cde/lib/tt/lib/util/Imakefile +++ b/cde/lib/tt/lib/util/Imakefile @@ -23,7 +23,7 @@ INCLUDES = -I../../lib CXXEXTRA_DEFINES = -D_ILS_MACROS #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/lib/tt/slib/Imakefile b/cde/lib/tt/slib/Imakefile index fce522a7..cbbc660c 100644 --- a/cde/lib/tt/slib/Imakefile +++ b/cde/lib/tt/slib/Imakefile @@ -17,7 +17,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) DEFINES = INCLUDES = -I. -I../lib -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif