From a34f78b798f84fa71612c62ccf898ecdc03f29aa Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Thu, 31 May 2012 13:47:41 +0100 Subject: [PATCH] convert all Imakefile LinuxDistribution to LinuxArchitecture. (programs part 2) --- cde/programs/dtappbuilder/src/ab/Imakefile | 2 +- cde/programs/dtappbuilder/src/abmf/Imakefile | 2 +- cde/programs/dtcm/dtcm/Imakefile | 2 +- cde/programs/dtcm/server/Imakefile | 2 +- cde/programs/dtcreate/Imakefile | 2 +- cde/programs/dtmail/MotifApp/Imakefile | 2 +- cde/programs/dtmail/dtmail/Imakefile | 2 +- cde/programs/dtmail/dtmailpr/Imakefile | 2 +- cde/programs/dtmail/libDtMail/Common/Imakefile | 2 +- cde/programs/dtmail/libDtMail/RFC/Imakefile | 2 +- cde/programs/dtpad/Imakefile | 2 +- cde/programs/dtprintinfo/Imakefile | 2 +- cde/programs/dtprintinfo/UI/Imakefile | 2 +- cde/programs/dtudcfonted/Imakefile | 2 +- cde/programs/dtwm/Imakefile | 2 +- cde/programs/util/dttypes/Imakefile | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/Imakefile b/cde/programs/dtappbuilder/src/ab/Imakefile index 1b369c2a..1bbfc7ff 100644 --- a/cde/programs/dtappbuilder/src/ab/Imakefile +++ b/cde/programs/dtappbuilder/src/ab/Imakefile @@ -251,7 +251,7 @@ WAITTARGET = .WAIT 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/programs/dtappbuilder/src/abmf/Imakefile b/cde/programs/dtappbuilder/src/abmf/Imakefile index ebda0774..f5125faf 100644 --- a/cde/programs/dtappbuilder/src/abmf/Imakefile +++ b/cde/programs/dtappbuilder/src/abmf/Imakefile @@ -111,7 +111,7 @@ WAITTARGET = .WAIT 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/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile index bb2d86d1..f669d36c 100644 --- a/cde/programs/dtcm/dtcm/Imakefile +++ b/cde/programs/dtcm/dtcm/Imakefile @@ -49,7 +49,7 @@ EXTRA_LIBRARIES = $(FNS_EXTRA_LIBS) 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/programs/dtcm/server/Imakefile b/cde/programs/dtcm/server/Imakefile index 78c30061..ba8e9fd6 100644 --- a/cde/programs/dtcm/server/Imakefile +++ b/cde/programs/dtcm/server/Imakefile @@ -51,7 +51,7 @@ EXTRA_LIBRARIES = -lsocket -lnsl -lintl 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/programs/dtcreate/Imakefile b/cde/programs/dtcreate/Imakefile index 40da336a..0668a6a3 100644 --- a/cde/programs/dtcreate/Imakefile +++ b/cde/programs/dtcreate/Imakefile @@ -57,7 +57,7 @@ SYS_LIBRARIES = -lm -ldl -lgen 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/programs/dtmail/MotifApp/Imakefile b/cde/programs/dtmail/MotifApp/Imakefile index 67943696..5c2c296b 100644 --- a/cde/programs/dtmail/MotifApp/Imakefile +++ b/cde/programs/dtmail/MotifApp/Imakefile @@ -34,7 +34,7 @@ EXTRA_C++OPTIONS = -xF +p +w $(SPRO_V3_OPTIONS) #endif /* SunArchitecture */ -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtmail/dtmail/Imakefile b/cde/programs/dtmail/dtmail/Imakefile index af5d3715..5eabe87b 100644 --- a/cde/programs/dtmail/dtmail/Imakefile +++ b/cde/programs/dtmail/dtmail/Imakefile @@ -16,7 +16,7 @@ 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(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile index 064ed1b7..7765d65d 100644 --- a/cde/programs/dtmail/dtmailpr/Imakefile +++ b/cde/programs/dtmail/dtmailpr/Imakefile @@ -40,7 +40,7 @@ MT_LIBS = -i $(C++_LIB) -lm -lw -lc SYS_LIBRARIES = -lintl -lnsl $(MT_LIBS) -lC #endif /* SunArchitecture */ -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtmail/libDtMail/Common/Imakefile b/cde/programs/dtmail/libDtMail/Common/Imakefile index 7a1530e1..59881aac 100644 --- a/cde/programs/dtmail/libDtMail/Common/Imakefile +++ b/cde/programs/dtmail/libDtMail/Common/Imakefile @@ -14,7 +14,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtmail/libDtMail/RFC/Imakefile b/cde/programs/dtmail/libDtMail/RFC/Imakefile index 0fec6839..c4ac453d 100644 --- a/cde/programs/dtmail/libDtMail/RFC/Imakefile +++ b/cde/programs/dtmail/libDtMail/RFC/Imakefile @@ -14,7 +14,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtpad/Imakefile b/cde/programs/dtpad/Imakefile index 4e34b138..a06f5bb4 100644 --- a/cde/programs/dtpad/Imakefile +++ b/cde/programs/dtpad/Imakefile @@ -13,7 +13,7 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs 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/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile index c55d4965..f948d316 100644 --- a/cde/programs/dtprintinfo/Imakefile +++ b/cde/programs/dtprintinfo/Imakefile @@ -23,7 +23,7 @@ all:: $(DTPRINTINFO_GEN) .NO_PARALLEL: #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtprintinfo/UI/Imakefile b/cde/programs/dtprintinfo/UI/Imakefile index 7a4d68e1..f92fd52b 100644 --- a/cde/programs/dtprintinfo/UI/Imakefile +++ b/cde/programs/dtprintinfo/UI/Imakefile @@ -16,7 +16,7 @@ INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../ob DEFINES = -DHAS_EXCEPTIONS #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtudcfonted/Imakefile b/cde/programs/dtudcfonted/Imakefile index 43db3666..4af9db3e 100644 --- a/cde/programs/dtudcfonted/Imakefile +++ b/cde/programs/dtudcfonted/Imakefile @@ -48,7 +48,7 @@ SYS_LIBRARIES = DtClientSysLibs 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/programs/dtwm/Imakefile b/cde/programs/dtwm/Imakefile index 40959ed9..2a172588 100644 --- a/cde/programs/dtwm/Imakefile +++ b/cde/programs/dtwm/Imakefile @@ -29,7 +29,7 @@ dtwm := LOCAL_LDFLAGS = -M mapfile.reorder 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/programs/util/dttypes/Imakefile b/cde/programs/util/dttypes/Imakefile index dc43b01f..e593ee2d 100644 --- a/cde/programs/util/dttypes/Imakefile +++ b/cde/programs/util/dttypes/Imakefile @@ -41,7 +41,7 @@ SYS_LIBRARIES = -lm -ldl -lgen 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 -- 2.25.1