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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user