From: Jon Trulson Date: Tue, 19 Jun 2012 22:27:20 +0000 (-0600) Subject: Remove hardcoded CCLINK's in Imakefiles when linking with C++ built libs (DtSvc). X-Git-Tag: 2.2.0a~26^2~16 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cdf8003f7cac489df3ec55e76690d6f8b29b23ad;p=oweals%2Fcde.git 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 6fe01b54..cf6be973 100644 --- 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 8d77490d..20dbf52c 100644 --- 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 66583b96..2cd2ebf8 100644 --- 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 429e4d1a..a58065fe 100644 --- 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 1bbfc7ff..1339d87f 100644 --- 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 f5125faf..abb7571b 100644 --- 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 955a34e9..85413ff1 100644 --- 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 f669d36c..4e36ab44 100644 --- 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 ba8e9fd6..f3158cea 100644 --- 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 0668a6a3..559834e9 100644 --- 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 c13c7286..a4f72e90 100644 --- 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 4866c21a..02a322a3 100644 --- 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 5d15d2b3..e3b280a4 100644 --- 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 d527c6fd..fb359dee 100644 --- 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 420e7cb0..468f238e 100644 --- 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 edb07096..31475b21 100644 --- 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 4ababeb0..d02c4954 100644 --- 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 ad23dc89..d6c06219 100644 --- 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 160a6a8e..0db5ce16 100644 --- 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 d02b80ca..1875a14d 100644 --- 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 8f34bb14..9ea9d850 100644 --- 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 5e1ecf3f..5b571c08 100644 --- 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 4bdc5760..2a013b70 100644 --- 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 a06f5bb4..c4affc35 100644 --- 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 601ac995..2a354862 100644 --- 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 b1d4ef85..33800065 100644 --- 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 d0eb76e2..4ff3192a 100644 --- 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 142ce57c..0f417a72 100644 --- 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 82fb2c57..5269b657 100644 --- 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 d7cb6c64..847bf14b 100644 --- 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 a65ac3c1..6afcac0b 100644 --- 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 4af9db3e..6d3c5cac 100644 --- 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 2a172588..b46fe1c5 100644 --- 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 e593ee2d..877df007 100644 --- 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