external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Jon Trulson 2012-06-19 16:27:20 -06:00
parent fff18bf2b7
commit cdf8003f7c
34 changed files with 5 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cde/config/cf/linux.cf
View file

@ -90,6 +90,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define AsCmd as
#define LdCmd ld
#define CplusplusLibC -lstdc++
#define AsmDefines -D__ELF__
#define MkdirHierCmd mkdir -p

4
cde/config/cf/lnxLib.tmpl
View file

@ -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

6
cde/lib/tt/bin/ttauth/Imakefile
View file

@ -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 =

6
cde/programs/dtaction/Imakefile
View file

@ -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

6
cde/programs/dtappbuilder/src/ab/Imakefile
View file

@ -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)

6
cde/programs/dtappbuilder/src/abmf/Imakefile
View file

@ -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)

6
cde/programs/dtcalc/Imakefile
View file

@ -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 \

6
cde/programs/dtcm/dtcm/Imakefile
View file

@ -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 \

6
cde/programs/dtcm/server/Imakefile
View file

@ -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 \

6
cde/programs/dtcreate/Imakefile
View file

@ -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 \

6
cde/programs/dtdbcache/Imakefile
View file

@ -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

6
cde/programs/dtdocbook/instant/Imakefile
View file

@ -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

6
cde/programs/dtdocbook/xlate_locale/Imakefile
View file

@ -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)

6
cde/programs/dtexec/Imakefile
View file

@ -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

7
cde/programs/dtfile/Imakefile
View file

@ -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 \

6
cde/programs/dtfile/dtcopy/Imakefile
View file

@ -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

6
cde/programs/dthelp/dthelpdemo/Imakefile
View file

@ -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

6
cde/programs/dthelp/dthelpgen/Imakefile
View file

@ -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

6
cde/programs/dthelp/dthelpprint/Imakefile
View file

@ -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

6
cde/programs/dthelp/dthelpview/Imakefile
View file

@ -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.

6
cde/programs/dticon/Imakefile
View file

@ -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 \

6
cde/programs/dtimsstart/Imakefile
View file

@ -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 \

1
cde/programs/dtlogin/Imakefile
View file

@ -127,7 +127,6 @@ DEPXAUTHLIB =
DEPXDMCPLIB =
/* Add in freetype header locations, required for modern Motif libs */
INCLUDES = -I/usr/include/freetype2
CCLINK = $(CXX)
#endif
/**************************************************************************

6
cde/programs/dtpad/Imakefile
View file

@ -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 \

6
cde/programs/dtpdm/Imakefile
View file

@ -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 \

6
cde/programs/dtscreen/Imakefile
View file

@ -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 \

6
cde/programs/dtsession/Imakefile
View file

@ -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

6
cde/programs/dtspcd/Imakefile
View file

@ -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)

6
cde/programs/dtstyle/Imakefile
View file

@ -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 \

6
cde/programs/dtterm/Imakefile
View file

@ -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.

6
cde/programs/dtudcexch/Imakefile
View file

@ -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) \

6
cde/programs/dtudcfonted/Imakefile
View file

@ -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)'

6
cde/programs/dtwm/Imakefile
View file

@ -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 \

6
cde/programs/util/dttypes/Imakefile
View file

@ -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