From 6a472bde30e8d7c64df6bacaac5ef96ea9b1b5eb Mon Sep 17 00:00:00 2001 From: levine Date: Tue, 25 Feb 1997 02:30:19 +0000 Subject: changed C++ compiler (CXX) from gcc to g++ so that libg++ will be linked in --- ChangeLog-97a | 11 +++++++++++ examples/IOStream/client/Makefile | 6 ------ examples/IOStream/server/Makefile | 6 ------ include/makeinclude/platform_irix5.3_g++.GNU | 2 +- include/makeinclude/platform_linux.GNU | 2 +- include/makeinclude/platform_linux_lxpthread.GNU | 2 +- include/makeinclude/platform_linux_lxpthreads.GNU | 2 +- include/makeinclude/platform_linux_pthread.GNU | 2 +- include/makeinclude/platform_m88k.GNU | 4 ++-- include/makeinclude/platform_osf1_4.0_g++.GNU | 2 +- include/makeinclude/platform_sco-nothread.GNU | 2 +- include/makeinclude/platform_sunos4_g++.GNU | 2 +- include/makeinclude/platform_sunos5_g++.GNU | 2 +- include/makeinclude/platform_sunos5_x86_g++.GNU | 2 +- include/makeinclude/platform_unixware_g++.GNU | 2 +- tests/Makefile | 6 ------ 16 files changed, 24 insertions(+), 31 deletions(-) diff --git a/ChangeLog-97a b/ChangeLog-97a index 073a08dfd8d..039edc71bb7 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,14 @@ +Mon Feb 24 20:28:10 1997 David L. Levine + + * include/makeinclude/platform_{irix5.3_g++,linux*,m88k, + osf1_4.0_g++,sco-nothread,sunos*g++,unixware_g++}.GNU: + changed C++ compiler (CXX) from gcc to g++ so that libg++ + will be linked in. + + * examples/IOStream/{client,server}/Makefile,tests/Makefile: + removed -lg++ when gcc is the compiler because it's no + longer needed with g++ as the compiler. + Mon Feb 24 11:52:08 1997 Douglas C. Schmidt * examples/Connection/non_blocking/CPP-acceptor.cpp (init): Added diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile index 97382e442ee..fe48a7d2a30 100644 --- a/examples/IOStream/client/Makefile +++ b/examples/IOStream/client/Makefile @@ -16,8 +16,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) -#### NOTE: VLDLIBS is (conditionally) defined below!!!! - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -29,10 +27,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU -ifneq (,$(findstring gcc,$(CXX))) -VLDLIBS += -lg++ -endif - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile index 8a8c3b4a4f9..339997d2371 100644 --- a/examples/IOStream/server/Makefile +++ b/examples/IOStream/server/Makefile @@ -16,8 +16,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) -#### NOTE: VLDLIBS is (conditionally) defined below!!!! - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -29,10 +27,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU -ifneq (,$(findstring gcc,$(CXX))) -VLDLIBS += -lg++ -endif - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU index 92e1915f156..a7fc2750a29 100644 --- a/include/makeinclude/platform_irix5.3_g++.GNU +++ b/include/makeinclude/platform_irix5.3_g++.GNU @@ -1,7 +1,7 @@ # Irix 5.3 with GNU C++ CC = gcc -CXX = gcc +CXX = g++ DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(WRAPPER_ROOT)/ace diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index bae70684bec..5c121529689 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -2,7 +2,7 @@ # should allow ACE to be built on Linux. CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS = -lstdc++ diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index c1c4cd4918e..134b765ce3d 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -7,7 +7,7 @@ # Jan Rychter CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 +CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index c1c4cd4918e..134b765ce3d 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -7,7 +7,7 @@ # Jan Rychter CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 +CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index df4b5ec2096..85369f80732 100644 --- a/include/makeinclude/platform_linux_pthread.GNU +++ b/include/makeinclude/platform_linux_pthread.GNU @@ -8,7 +8,7 @@ # Jan Rychter CC = gcc -w -CXX = gcc -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS DLD = $(CXX) LD = $(CXX) LIBS += -lpthreads -lstdc++ diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index 83ef4565abd..9c8f74a829c 100644 --- a/include/makeinclude/platform_m88k.GNU +++ b/include/makeinclude/platform_m88k.GNU @@ -1,8 +1,8 @@ # SunOS 5.x (Solaris 2.x) with SunC++ 4.x # *not* using Orbix CC = gcc -w -#CXX = gcc -w -frepo -I. -fno-strict-prototypes -D__INLINE__ -CXX = gcc -w -I. -fno-strict-prototypes -D__INLINE__ +#CXX = g++ -w -frepo -I. -fno-strict-prototypes -D__INLINE__ +CXX = g++ -w -I. -fno-strict-prototypes -D__INLINE__ CXX += -D__m88k__ DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU index 4b5ca0691f8..02c463c0e1c 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.0_g++.GNU @@ -2,7 +2,7 @@ # (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer). CC = gcc -g -D_REENTRANT -CXX = gcc -g -D_REENTRANT -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -g -D_REENTRANT -fno-strict-prototypes -D__ACE_INLINE__ LD = $(CXX) DLD = $(CXX) LIBS += -lpthread -lmach -lexc -ltli -lstdc++ diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index a01dc7062c6..a38f80c6233 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -4,7 +4,7 @@ CC = gcc -w # for threads # for no threads -CXX = gcc -fno-implicit-templates -w -I. -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -fno-implicit-templates -w -I. -fno-strict-prototypes -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS = -lstdc++ -lsocket diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index 32437d8d2ed..e31563c59a6 100644 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ b/include/makeinclude/platform_sunos4_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -CXX = gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo +CXX = g++ -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo DLD = /bin/ld LD = $(CXX) # diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index c0a32b44fc5..1c17c596d1a 100644 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ b/include/makeinclude/platform_sunos5_g++.GNU @@ -2,7 +2,7 @@ # # SOBUILD - compile into .so directly # -CXX = gcc -I. -Wall -Wpointer-arith -D__ACE_INLINE__ # -O2 -Winline +CXX = g++ -I. -Wall -Wpointer-arith -D__ACE_INLINE__ # -O2 -Winline CC = $(CXX) DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU index e95b7f53893..6e5e2f9265c 100644 --- a/include/makeinclude/platform_sunos5_x86_g++.GNU +++ b/include/makeinclude/platform_sunos5_x86_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -CXX = gcc -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo +CXX = g++ -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo DLD = $(CXX) LD = $(CXX) LDFLAGS += -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index 9c35a7a513a..fcfa1766f6d 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -w -CXX = gcc -I. -D__ACE_INLINE__ # -w -fno-strict-prototypes +CXX = g++ -I. -D__ACE_INLINE__ # -w -fno-strict-prototypes DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(WRAPPER_ROOT)/ace -L./ -L/usr/lib diff --git a/tests/Makefile b/tests/Makefile index 4b1cbba8335..09d8566931d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -52,8 +52,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR)) BUILD = $(VBIN) -#### NOTE: VLDLIBS is (conditionally) defined below!!!! - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -65,10 +63,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU -ifneq (,$(findstring gcc,$(CXX))) -VLDLIBS += -lg++ -endif - #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- -- cgit v1.2.1