From: Peter Howkins Date: Thu, 31 May 2012 12:40:38 +0000 (+0100) Subject: Convert all Imakefile LinuxDistribution switches to LinuxArchitecture. X-Git-Tag: 2.2.0a~26^2~28 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d555edb6c06ae2be90695849451189648f3f230;p=oweals%2Fcde.git Convert all Imakefile LinuxDistribution switches to LinuxArchitecture. (programs part1) --- diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile index 50aaf51f..429e4d1a 100644 --- a/cde/programs/dtaction/Imakefile +++ b/cde/programs/dtaction/Imakefile @@ -14,7 +14,7 @@ EXTRA_DEFINES = +e 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/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile index 17823c26..955a34e9 100644 --- a/cde/programs/dtcalc/Imakefile +++ b/cde/programs/dtcalc/Imakefile @@ -33,7 +33,7 @@ SYS_LIBRARIES = -lm -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/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile index 067b0c97..c13c7286 100644 --- a/cde/programs/dtdbcache/Imakefile +++ b/cde/programs/dtdbcache/Imakefile @@ -60,7 +60,7 @@ SYS_LIBRARIES = -lm -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/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile index fdf05f81..4866c21a 100644 --- a/cde/programs/dtdocbook/instant/Imakefile +++ b/cde/programs/dtdocbook/instant/Imakefile @@ -14,7 +14,7 @@ EXTRA_LIBRARIES = -lm 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/dtdocbook/xlate_locale/Imakefile b/cde/programs/dtdocbook/xlate_locale/Imakefile index eb349ee7..5d15d2b3 100644 --- a/cde/programs/dtdocbook/xlate_locale/Imakefile +++ b/cde/programs/dtdocbook/xlate_locale/Imakefile @@ -15,7 +15,7 @@ SYS_LIBRARIES = -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/dtexec/Imakefile b/cde/programs/dtexec/Imakefile index 5cffc3dc..d527c6fd 100644 --- a/cde/programs/dtexec/Imakefile +++ b/cde/programs/dtexec/Imakefile @@ -7,7 +7,7 @@ INCLUDES = -I. 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/dtfile/Imakefile b/cde/programs/dtfile/Imakefile index 19a5063b..420e7cb0 100644 --- a/cde/programs/dtfile/Imakefile +++ b/cde/programs/dtfile/Imakefile @@ -29,7 +29,7 @@ EXTRA_CCOPTIONS = -xF 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) EXTRA_DEFINES = -I/usr/include/freetype2 #endif diff --git a/cde/programs/dtfile/dtcopy/Imakefile b/cde/programs/dtfile/dtcopy/Imakefile index 6da100b9..edb07096 100644 --- a/cde/programs/dtfile/dtcopy/Imakefile +++ b/cde/programs/dtfile/dtcopy/Imakefile @@ -12,7 +12,7 @@ EXTRA_CCOPTIONS = -xF 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/dthelp/dthelpdemo/Imakefile b/cde/programs/dthelp/dthelpdemo/Imakefile index 8c6b85ac..4ababeb0 100644 --- a/cde/programs/dthelp/dthelpdemo/Imakefile +++ b/cde/programs/dthelp/dthelpdemo/Imakefile @@ -19,7 +19,7 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) 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/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile index 9bb1ca42..ad23dc89 100644 --- a/cde/programs/dthelp/dthelpgen/Imakefile +++ b/cde/programs/dthelp/dthelpgen/Imakefile @@ -13,7 +13,7 @@ EXTRA_INCLUDES = -I$(DTHELPSRC) 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/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile index a81a5450..160a6a8e 100644 --- a/cde/programs/dthelp/dthelpprint/Imakefile +++ b/cde/programs/dthelp/dthelpprint/Imakefile @@ -18,7 +18,7 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) 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/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile index df38f4ed..d02b80ca 100644 --- a/cde/programs/dthelp/dthelpview/Imakefile +++ b/cde/programs/dthelp/dthelpview/Imakefile @@ -3,7 +3,7 @@ PROGRAMS = dthelpview 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/dticon/Imakefile b/cde/programs/dticon/Imakefile index 898a1357..8f34bb14 100644 --- a/cde/programs/dticon/Imakefile +++ b/cde/programs/dticon/Imakefile @@ -55,7 +55,7 @@ EXTRA_DEFINES = 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/dtimsstart/Imakefile b/cde/programs/dtimsstart/Imakefile index 6f957ff5..5e1ecf3f 100644 --- a/cde/programs/dtimsstart/Imakefile +++ b/cde/programs/dtimsstart/Imakefile @@ -27,7 +27,7 @@ EXTRA_DEFINES = -DANSICPP 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/dtpdm/Imakefile b/cde/programs/dtpdm/Imakefile index 6dacbe91..601ac995 100644 --- a/cde/programs/dtpdm/Imakefile +++ b/cde/programs/dtpdm/Imakefile @@ -31,7 +31,7 @@ SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC 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/dtscreen/Imakefile b/cde/programs/dtscreen/Imakefile index b011791d..b1d4ef85 100644 --- a/cde/programs/dtscreen/Imakefile +++ b/cde/programs/dtscreen/Imakefile @@ -13,7 +13,7 @@ LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) 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/dtsearchpath/libCliSrv/Imakefile b/cde/programs/dtsearchpath/libCliSrv/Imakefile index 89d9e180..637c0c57 100644 --- a/cde/programs/dtsearchpath/libCliSrv/Imakefile +++ b/cde/programs/dtsearchpath/libCliSrv/Imakefile @@ -22,7 +22,7 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS EXTRA_DEFINES = -DIOSTREAMSWORKS #endif -#if defined(LinuxDistribution) +#if defined(LinuxArchitecture) CXXEXTRA_DEFINES = -fpermissive #endif diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index f6bc68ff..d0eb76e2 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -69,7 +69,7 @@ SYS_LIBRARIES = -lelf -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/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile index 04a5590a..142ce57c 100644 --- a/cde/programs/dtspcd/Imakefile +++ b/cde/programs/dtspcd/Imakefile @@ -32,7 +32,7 @@ SYS_LIBRARIES = -lm 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/dtstyle/Imakefile b/cde/programs/dtstyle/Imakefile index 3b10e958..82fb2c57 100644 --- a/cde/programs/dtstyle/Imakefile +++ b/cde/programs/dtstyle/Imakefile @@ -21,7 +21,7 @@ EXTRA_DEFINES = -D$(PROGRAMS) 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/dtterm/Imakefile b/cde/programs/dtterm/Imakefile index 2cb6e6ef..d7cb6c64 100644 --- a/cde/programs/dtterm/Imakefile +++ b/cde/programs/dtterm/Imakefile @@ -31,7 +31,7 @@ USE_XHPLIB = $(XHPLIB) 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/dtudcexch/Imakefile b/cde/programs/dtudcexch/Imakefile index 72b2577f..a65ac3c1 100644 --- a/cde/programs/dtudcexch/Imakefile +++ b/cde/programs/dtudcexch/Imakefile @@ -30,7 +30,7 @@ UDC_INC_PATH7 = -I$(FONTEDT_PATH1)/dtgpftobdf 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