Remove hardcoded CCLINK's in Imakefiles when linking with C++ built libs (DtSvc).

Added proper SharedDtSvcReqs in lnxLib.tmpl and CplusplusLibC in
linux.cf.  This allows the libstdc++ dependancy to be properly
declared for libDtSvc so that it is not neccessary to hardcode 'CCLINK
= g++' in the Imakefiles of programs linking angainst libDtSvc.

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 6fe01b541dafdfe4677de30479c67865742626e2..cf6be9735214fa786b7c0d7609772b8b3bd0beda 100644 (file)
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -90,6 +90,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define AsCmd                  as
 #define LdCmd                  ld
 
+#define CplusplusLibC           -lstdc++
 #define AsmDefines             -D__ELF__
 
 #define MkdirHierCmd           mkdir -p

diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl
index 8d77490da84492ce5f3dc6a357b4ff3aff815d93..20dbf52cb6d30971dcc12cec8be10899574cdfc3 100644 (file)
--- a/cde/config/cf/lnxLib.tmpl
+++ b/cde/config/cf/lnxLib.tmpl
@@ -34,6 +34,10 @@ XMULIB = -lXmu $(XLIB)
 # define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
 #endif
 
+#ifndef SharedDtSvcReqs
+# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
+#endif
+
 #ifndef SharedCsaReqs
 # define SharedCsaReqs -lXt
 #endif

diff --git a/cde/lib/tt/bin/ttauth/Imakefile b/cde/lib/tt/bin/ttauth/Imakefile
index 66583b9643985a3ff0d24cd069f3fc5221ce0c62..2cd2ebf89b8bd08159d136c828fcf7ee384a1d85 100644 (file)
--- a/cde/lib/tt/bin/ttauth/Imakefile
+++ b/cde/lib/tt/bin/ttauth/Imakefile
@@ -7,12 +7,6 @@ DEFINES        =
 CONN_DEFINES    = ConnectionFlags
 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(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 DEPLIBS         = TtClientDepLibs
 LOCAL_LIBRARIES = TtClientLibs
 SYS_LIBRARIES   = 

diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile
index 429e4d1af95375685cf9235fbe8a66fb626f9b94..a58065fe43aa320f0aafb740dd6b2ec1e278bdf2 100644 (file)
--- a/cde/programs/dtaction/Imakefile
+++ b/cde/programs/dtaction/Imakefile
@@ -12,12 +12,6 @@ SYS_LIBRARIES   = -lm
 EXTRA_DEFINES = +e
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 #ifdef LinuxArchitecture
 SYS_LIBRARIES   = -lm -lcrypt
 #endif

diff --git a/cde/programs/dtappbuilder/src/ab/Imakefile b/cde/programs/dtappbuilder/src/ab/Imakefile
index 1bbfc7ff58543b480733cd623918499ada7a9c02..1339d87fbb5b4e18d6f5f7b93823d13f1b772473 100644 (file)
--- a/cde/programs/dtappbuilder/src/ab/Imakefile
+++ b/cde/programs/dtappbuilder/src/ab/Imakefile
@@ -249,12 +249,6 @@ SYS_LIBRARIES = -lm $(ICONVSYSLIB) $(DYNLIBSYSLIB) $(REGEXSYSLIB)
 WAITTARGET = .WAIT
 #endif /* SunArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS = dtbuilder
 LINTLIBS = $(XINPUTLIB) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
 

diff --git a/cde/programs/dtappbuilder/src/abmf/Imakefile b/cde/programs/dtappbuilder/src/abmf/Imakefile
index f5125faf0a1e598b41a5dcee955ae344940c0997..abb7571b6cc0a525751fae95ce4768ae6ad57b2d 100644 (file)
--- a/cde/programs/dtappbuilder/src/abmf/Imakefile
+++ b/cde/programs/dtappbuilder/src/abmf/Imakefile
@@ -109,12 +109,6 @@ CCOPTIONS = -qnoro
 WAITTARGET = .WAIT
 #endif /* SunArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS = dtcodegen
 LINTLIBS = $(XINPUTLIB) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
 

diff --git a/cde/programs/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile
index 955a34e9507be314cf4ff7fe2e344c5cfc735eff..85413ff128769bd1657aa365cbc91add0c55fa06 100644 (file)
--- a/cde/programs/dtcalc/Imakefile
+++ b/cde/programs/dtcalc/Imakefile
@@ -31,12 +31,6 @@ SYS_LIBRARIES = -lm -lgen
 #if defined(HPOSFArchitecture)
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS =  calctool.c      ds_common.c     ds_popup.c \
         ds_widget.c     ds_xlib.c       functions.c \
         help.c          motif.c         mp.c \

diff --git a/cde/programs/dtcm/dtcm/Imakefile b/cde/programs/dtcm/dtcm/Imakefile
index f669d36c5b35b6f3148d1ee54f27047bfe4e8fbd..4e36ab44a1cbf71b9eb02a1d43b958395c8c9a3e 100644 (file)
--- a/cde/programs/dtcm/dtcm/Imakefile
+++ b/cde/programs/dtcm/dtcm/Imakefile
@@ -47,12 +47,6 @@ EXTRA_CCOPTIONS = -xstrconst -Xc -v
 EXTRA_LIBRARIES = $(FNS_EXTRA_LIBS)
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROG1 = dtcm
 SRCS1 =        MonthPanel.c    RFCMIME.c       about.c \
        alarm.c         blist.c         browser.c \

diff --git a/cde/programs/dtcm/server/Imakefile b/cde/programs/dtcm/server/Imakefile
index ba8e9fd6983a4d6560ca9cdf184052cc63af20f8..f3158cea473fad2b7fb710185d95cadd280e1d57 100644 (file)
--- a/cde/programs/dtcm/server/Imakefile
+++ b/cde/programs/dtcm/server/Imakefile
@@ -49,12 +49,6 @@ EXTRA_CCOPTIONS = -xstrconst -Xc -v
 EXTRA_LIBRARIES = -lsocket -lnsl -lintl
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = \
        parser.y        access.c        callback.c \
        cmscalendar.c   cmsconvert.c    cmsentry.c \

diff --git a/cde/programs/dtcreate/Imakefile b/cde/programs/dtcreate/Imakefile
index 0668a6a35e85823189dbec56fb546fa3d929ea18..559834e956aed0d24bce68d5aa0b7336e8498337 100644 (file)
--- a/cde/programs/dtcreate/Imakefile
+++ b/cde/programs/dtcreate/Imakefile
@@ -55,12 +55,6 @@ EXTRA_DEFINES = -Xt -D_NO_PROTO
 SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* UXPArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = \
         main.c          \
         AddFiletype.c   \

diff --git a/cde/programs/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile
index c13c72869665c0cfd4dfc71809643be585443247..a4f72e906df4092266fa02877773d3f76fb5eeae 100644 (file)
--- a/cde/programs/dtdbcache/Imakefile
+++ b/cde/programs/dtdbcache/Imakefile
@@ -58,12 +58,6 @@ SYS_LIBRARIES = -lm -ldl -lw -lgen
 SYS_LIBRARIES = -lm -lgen
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = Main.c
 OBJS = Main.o
 

diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile
index 4866c21abebedb3e1233ae7868a7de82dd26bec0..02a322a382225827b47348a4f7760b2e94975211 100644 (file)
--- a/cde/programs/dtdocbook/instant/Imakefile
+++ b/cde/programs/dtdocbook/instant/Imakefile
@@ -12,12 +12,6 @@ EXTRA_LIBRARIES = -lsocket -lnsl -lgen -lm
 EXTRA_LIBRARIES = -lm
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 OBJS = main.o util.o info.o translate.o traninit.o tranvar.o tables.o browse.o
 SRCS = main.c util.c info.c translate.c traninit.c tranvar.c tables.c browse.c
 

diff --git a/cde/programs/dtdocbook/xlate_locale/Imakefile b/cde/programs/dtdocbook/xlate_locale/Imakefile
index 5d15d2b36be4331f3fb826e6f28f2d7bc6cccbfc..e3b280a4c7d96ac94ed2e9f5cf25b0705586405f 100644 (file)
--- a/cde/programs/dtdocbook/xlate_locale/Imakefile
+++ b/cde/programs/dtdocbook/xlate_locale/Imakefile
@@ -13,12 +13,6 @@ OBJS =  xlate_locale.o
 SYS_LIBRARIES = -lgen 
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 DEPLIBS = $(DEPDTSVCLIB)
 LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB)
 

diff --git a/cde/programs/dtexec/Imakefile b/cde/programs/dtexec/Imakefile
index d527c6fd264b8dc5f52259fbd00b62a9f7d24bf0..fb359dee3bf2ee3dc7b6a4b0bc21d2b50c8f112d 100644 (file)
--- a/cde/programs/dtexec/Imakefile
+++ b/cde/programs/dtexec/Imakefile
@@ -5,12 +5,6 @@ LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
 DEFINES = -DMSGLOG_CLIENT_ONLY
 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(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = DtGetMessage.c Main.c MsgLog.c Version.c
 OBJS = DtGetMessage.o Main.o MsgLog.o Version.o
 

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 420e7cb07edcceff0133f9348472d095d3834175..468f238eed1ecd090bd24590a67c871253ce6048 100644 (file)
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -27,13 +27,6 @@ EXTRA_DEFINES = -D_TOOLTALK
 EXTRA_CCOPTIONS = -xF
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-EXTRA_DEFINES = -I/usr/include/freetype2
-#endif
-
 SRCS =  ChangeDir.c     ChangeDirP.c    Command.c       Common.c \
         Desktop.c       Directory.c     Encaps.c        File.c \
         FileDialog.c    FileManip.c     FileMgr.c       FileOp.c \

diff --git a/cde/programs/dtfile/dtcopy/Imakefile b/cde/programs/dtfile/dtcopy/Imakefile
index edb07096eeedf860577b35828d6f884c328bf577..31475b21d7905e0dc07ad878fac828b055b44d0d 100644 (file)
--- a/cde/programs/dtfile/dtcopy/Imakefile
+++ b/cde/programs/dtfile/dtcopy/Imakefile
@@ -10,12 +10,6 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 EXTRA_CCOPTIONS = -xF
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS =  main_dtcopy.c   copydialog.c    overwrtdialog.c dosync.c \
         fsrtns.c        utils.c         errordialog.c   sharedFuncs.c
 

diff --git a/cde/programs/dthelp/dthelpdemo/Imakefile b/cde/programs/dthelp/dthelpdemo/Imakefile
index 4ababeb0299327a4a2bc6161149e74b800b37f99..d02c49543fa99dfe52b30b3ddeacbe5450379f87 100644 (file)
--- a/cde/programs/dthelp/dthelpdemo/Imakefile
+++ b/cde/programs/dthelp/dthelpdemo/Imakefile
@@ -17,12 +17,6 @@ DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
 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(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = Main.c HourGlass.c HelpCache.c
 OBJS = Main.o HourGlass.o HelpCache.o
 

diff --git a/cde/programs/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile
index ad23dc8944ee04647f54614e50044b5fdecd7af7..d6c0621904dd15a11852e1c71a5c189dbcc8603d 100644 (file)
--- a/cde/programs/dthelp/dthelpgen/Imakefile
+++ b/cde/programs/dthelp/dthelpgen/Imakefile
@@ -11,12 +11,6 @@ SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 
 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(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = helpgen.c version.c
 OBJS = helpgen.o version.o
 

diff --git a/cde/programs/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile
index 160a6a8e3d479c1c372a5a7596cb853939fa8983..0db5ce168b63efb62dcfc1e0ab94d11472e56da0 100644 (file)
--- a/cde/programs/dthelp/dthelpprint/Imakefile
+++ b/cde/programs/dthelp/dthelpprint/Imakefile
@@ -16,12 +16,6 @@ SYS_LIBRARIES = DtClientSysLibs -lw $(CXXLIB)
 SYS_LIBRARIES = DtClientSysLibs $(CXXLIB)
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = Main.c Initialize.c PrintUtil.c PrintTopics.c PrintManStrFile.c version.c
 OBJS = Main.o Initialize.o PrintUtil.o PrintTopics.o PrintManStrFile.o version.o
 

diff --git a/cde/programs/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile
index d02b80cac0de85d78625f38e09ab4ed062d6808c..1875a14d0d35a47e3481ee81c993ff4daeaa797c 100644 (file)
--- a/cde/programs/dthelp/dthelpview/Imakefile
+++ b/cde/programs/dthelp/dthelpview/Imakefile
@@ -1,12 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:44 drk $
 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(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 DEFINES = -D_BMS
 INCLUDES = -I. 
 

diff --git a/cde/programs/dticon/Imakefile b/cde/programs/dticon/Imakefile
index 8f34bb14e08d2b93a3622e38703b17de09d35922..9ea9d850a395be37915f7536cd7d570bcb740e81 100644 (file)
--- a/cde/programs/dticon/Imakefile
+++ b/cde/programs/dticon/Imakefile
@@ -53,12 +53,6 @@ SYS_LIBRARIES = -lm -ldl -lgen
 EXTRA_DEFINES =
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS =  dtIconShell.c   event.c         fileIO.c \
         fileIODialog.c  globals.c       graphics.c \
         help.c          image.c         main.c \

diff --git a/cde/programs/dtimsstart/Imakefile b/cde/programs/dtimsstart/Imakefile
index 5e1ecf3f97a03723b764d056f9eea1815ba4e9c0..5b571c0877c95af26149d4e23763a64987a56f1e 100644 (file)
--- a/cde/programs/dtimsstart/Imakefile
+++ b/cde/programs/dtimsstart/Imakefile
@@ -25,12 +25,6 @@ EXTRA_CCOPTIONS = -xF
 EXTRA_DEFINES = -DANSICPP
 #endif /* RsArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS=dtimsstart 
 
 SRCS = action.c        env.c           file.c \

diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile
index 4bdc5760f169eaa5ebe650a146f5820d7b31db07..2a013b7026ace5c1921cb36ebc3da068f5cbc11f 100644 (file)
--- a/cde/programs/dtlogin/Imakefile
+++ b/cde/programs/dtlogin/Imakefile
@@ -127,7 +127,6 @@ DEPXAUTHLIB =
 DEPXDMCPLIB = 
 /* Add in freetype header locations, required for modern Motif libs */
 INCLUDES = -I/usr/include/freetype2
-CCLINK = $(CXX)
 #endif
 
 /**************************************************************************

diff --git a/cde/programs/dtpad/Imakefile b/cde/programs/dtpad/Imakefile
index a06f5bb4ac733b5e7b5b05f61bda01af4d0e7a4f..c4affc35ee634fe59772b7b2344d7145f95347e0 100644 (file)
--- a/cde/programs/dtpad/Imakefile
+++ b/cde/programs/dtpad/Imakefile
@@ -11,12 +11,6 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 #   LOCAL_LDFLAGS = -M mapfile.reorder
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = \
         dtpad.c         editCB.c        fileCB.c \
         fileDlg.c       fileIo.c        formatCB.c \

diff --git a/cde/programs/dtpdm/Imakefile b/cde/programs/dtpdm/Imakefile
index 601ac9955149145135dc623550f0e7b4c94fd31a..2a3548625e0fe9487a280ca7a990d9c8484a23b7 100644 (file)
--- a/cde/programs/dtpdm/Imakefile
+++ b/cde/programs/dtpdm/Imakefile
@@ -29,12 +29,6 @@ SYS_LIBRARIES = -lmsaa -liconv
 SYS_LIBRARIES = -lintl -L/opt/SUNWspro/SC2.0.1 -lm -lgen -ldl -lC
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS = dtpdm
 
 SRCS = JobBox.c        Main.c          MainWindow.c \

diff --git a/cde/programs/dtscreen/Imakefile b/cde/programs/dtscreen/Imakefile
index b1d4ef85de2837f9560a8d144e0dd53866bfbd1b..3380006574f56e0a6a7098f8ee4d2a095d902d4e 100644 (file)
--- a/cde/programs/dtscreen/Imakefile
+++ b/cde/programs/dtscreen/Imakefile
@@ -11,12 +11,6 @@ LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
   SYS_LIBRARIES = -lm -lcrypt
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program 
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = blank.c         dtscreen.c      flame.c         hopalong.c \
        hsbramp.c       image.c         life.c          pyro.c \
        qix.c           resource.c      rotor.c         swarm.c \

diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile
index d0eb76e269b92ffb421e101732018d73b02b05e4..4ff3192a6de999c516e81c36e1bbe2cbcc1bb72e 100644 (file)
--- a/cde/programs/dtsession/Imakefile
+++ b/cde/programs/dtsession/Imakefile
@@ -67,12 +67,6 @@ DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 SYS_LIBRARIES = -lelf -lm -ldl -lgen
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS=dtsession
 
 /**** Every .o except version.o may only be built in a remote

diff --git a/cde/programs/dtspcd/Imakefile b/cde/programs/dtspcd/Imakefile
index 142ce57ce5f458e1ec6ed5b4378333bc200d1777..0f417a7220cfb536eda1822d1a8b311f04edbffd 100644 (file)
--- a/cde/programs/dtspcd/Imakefile
+++ b/cde/programs/dtspcd/Imakefile
@@ -30,12 +30,6 @@ LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
 SYS_LIBRARIES = -lm
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 #if defined(UXPArchitecture)
 LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \
        $(XMLIB) $(XTOOLLIB) $(XLIB)

diff --git a/cde/programs/dtstyle/Imakefile b/cde/programs/dtstyle/Imakefile
index 82fb2c572395ac84f9f7423a3f966f7e9f460292..5269b657a05fae7371c20c987beb1433c1492f2a 100644 (file)
--- a/cde/programs/dtstyle/Imakefile
+++ b/cde/programs/dtstyle/Imakefile
@@ -19,12 +19,6 @@ EXTRA_OBJS = OWsync.o
 EXTRA_DEFINES = -D$(PROGRAMS)
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 PROGRAMS = dtstyle
 
 OBJS = Main.o version.o MainWin.o Font.o Audio.o \

diff --git a/cde/programs/dtterm/Imakefile b/cde/programs/dtterm/Imakefile
index d7cb6c643cf99cb9e0d23d6c13edf86f81b4a947..847bf14baf813cc52681630680e1e04ac978fed6 100644 (file)
--- a/cde/programs/dtterm/Imakefile
+++ b/cde/programs/dtterm/Imakefile
@@ -29,12 +29,6 @@ DEPHELPLIB = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB)
 USE_XHPLIB = $(XHPLIB)
 #endif /* HPArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 /* DEPLIBS contains the list of library depencies for a client.
  * LOCAL_LIBRARIES contains the list of libraries on the link line.
  * Generally, the dependency form of a library has DEP as a prefix.

diff --git a/cde/programs/dtudcexch/Imakefile b/cde/programs/dtudcexch/Imakefile
index a65ac3c1b532ac60351a6655a060d51ec9592651..6afcac0bb891a923a8cd5c9349af8b90c63c276e 100644 (file)
--- a/cde/programs/dtudcexch/Imakefile
+++ b/cde/programs/dtudcexch/Imakefile
@@ -28,12 +28,6 @@ UDC_INC_PATH7     =  -I$(FONTEDT_PATH1)/dtgpftobdf
         OPT2 = -DFONTC='"'$(BINDIR)/bdftopcf'"'
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 DEFINES = $(OPT2)
 
 DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) \

diff --git a/cde/programs/dtudcfonted/Imakefile b/cde/programs/dtudcfonted/Imakefile
index 4af9db3e68da2f02bfdeca508fb7fecb677e0654..6d3c5caccef36a6f7e885ea85c4ceb35609d2f75 100644 (file)
--- a/cde/programs/dtudcfonted/Imakefile
+++ b/cde/programs/dtudcfonted/Imakefile
@@ -46,12 +46,6 @@ SYS_LIBRARIES = DtClientSysLibs -lw
 SYS_LIBRARIES = DtClientSysLibs
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 

diff --git a/cde/programs/dtwm/Imakefile b/cde/programs/dtwm/Imakefile
index 2a172588b73d194b5b1c77e50c41ba474afd624f..b46fe1c5aa728a9109d061001c3cbf0ab2c33bb3 100644 (file)
--- a/cde/programs/dtwm/Imakefile
+++ b/cde/programs/dtwm/Imakefile
@@ -27,12 +27,6 @@ EXTRA_CCOPTIONS = -xF
 dtwm := LOCAL_LDFLAGS = -M mapfile.reorder
 #endif
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
- 
 SRCSXM = \
         WmCDInfo.c      WmCDecor.c      WmCEvent.c \
         WmCPlace.c      WmColormap.c    WmError.c \

diff --git a/cde/programs/util/dttypes/Imakefile b/cde/programs/util/dttypes/Imakefile
index e593ee2d76f18c62ff159040ac1057b49cc574b4..877df0073b39c7a90c1eb9a7dfef403e26a1544e 100644 (file)
--- a/cde/programs/util/dttypes/Imakefile
+++ b/cde/programs/util/dttypes/Imakefile
@@ -39,12 +39,6 @@ ATLIB=
 SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxArchitecture)
-CCLINK = $(CXX)
-#endif
-
 SRCS = dttypes.c
 OBJS = dttypes.o