Convert all Imakefile LinuxDistribution switches to LinuxArchitecture.

(programs part1)

diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile
index 50aaf51fefde0621134975fbe24bb60e3b55abb6..429e4d1af95375685cf9235fbe8a66fb626f9b94 100644 (file)
--- 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 17823c266f8c2f4279b91737dc4de721a17916a5..955a34e9507be314cf4ff7fe2e344c5cfc735eff 100644 (file)
--- 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 067b0c972c88b05f9808314ddb2679c91dacac9c..c13c72869665c0cfd4dfc71809643be585443247 100644 (file)
--- 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 fdf05f81e53ad29dae798802ee5ee1ef8abf6b37..4866c21abebedb3e1233ae7868a7de82dd26bec0 100644 (file)
--- 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 eb349ee74cbb95e27356e5264513442bf9491318..5d15d2b36be4331f3fb826e6f28f2d7bc6cccbfc 100644 (file)
--- 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 5cffc3dc38d8c6e56f8fbe1d58126a953525a04d..d527c6fd264b8dc5f52259fbd00b62a9f7d24bf0 100644 (file)
--- 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 19a5063b498ea1c1c5987cda8137f88cde830647..420e7cb07edcceff0133f9348472d095d3834175 100644 (file)
--- 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 6da100b9f3ee0a432cae70dd925f53a143515f47..edb07096eeedf860577b35828d6f884c328bf577 100644 (file)
--- 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 8c6b85acad404b61b2247d638753535a67765d6c..4ababeb0299327a4a2bc6161149e74b800b37f99 100644 (file)
--- 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 9bb1ca428a05d9e0e2b5d5f1d8595a042198d62c..ad23dc8944ee04647f54614e50044b5fdecd7af7 100644 (file)
--- 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 a81a54506c16a48b5249a95be69c81e1d09831bb..160a6a8e3d479c1c372a5a7596cb853939fa8983 100644 (file)
--- 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 df38f4ed8e0f9eff45ff8ae5d7fdd4036ffeb090..d02b80cac0de85d78625f38e09ab4ed062d6808c 100644 (file)
--- 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 898a1357f2bf7d9d84aac80a99f9547a62a6827f..8f34bb14e08d2b93a3622e38703b17de09d35922 100644 (file)
--- 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 6f957ff55312f3389c78e76a0d4cfde8fc1c79c0..5e1ecf3f97a03723b764d056f9eea1815ba4e9c0 100644 (file)
--- 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 6dacbe91bfbc1a131c803d998020fedf16ef9a77..601ac9955149145135dc623550f0e7b4c94fd31a 100644 (file)
--- 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 b011791d7ed43aacc390d0c6cf0cebb8bb3244d3..b1d4ef85de2837f9560a8d144e0dd53866bfbd1b 100644 (file)
--- 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 89d9e180b7144dd92fd3cf55bb72dadd50f60c9d..637c0c57ac9d5f3d7bf2790f6b8b708769e55476 100644 (file)
--- 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 f6bc68ff473a43898255bf9756d1a385ccb4f6e0..d0eb76e269b92ffb421e101732018d73b02b05e4 100644 (file)
--- 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 04a5590af2003d673e296a73408f9d3161d8760c..142ce57ce5f458e1ec6ed5b4378333bc200d1777 100644 (file)
--- 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 3b10e958c47e55c95c4a7aa8d64bd2448ae93cfd..82fb2c572395ac84f9f7423a3f966f7e9f460292 100644 (file)
--- 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 2cb6e6effa168cc15faccb5df6b969d87ab22dad..d7cb6c643cf99cb9e0d23d6c13edf86f81b4a947 100644 (file)
--- 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 72b2577f395795975d20e7e4bff1de6d7f5fd43a..a65ac3c1b532ac60351a6655a060d51ec9592651 100644 (file)
--- 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