diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-17 21:32:10 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-04-17 21:32:10 +0000 |
| commit | ba303b847c44b8d2f1a6805ce061625f6ccf439d (patch) | |
| tree | 2a272c4a4b2365af29d51092c8716edfed173e55 /include | |
| parent | cf6f7a1ace5b78d768898481476aa4f970d5ebb0 (diff) | |
| download | ATCD-ba303b847c44b8d2f1a6805ce061625f6ccf439d.tar.gz | |
moved -g out of wrapper_macros.GNU and into each platform file so that -gstabs can be used on SCO
Diffstat (limited to 'include')
41 files changed, 119 insertions, 61 deletions
diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU index a969c5227b1..b7d90769e96 100644 --- a/include/makeinclude/platform_aix.GNU +++ b/include/makeinclude/platform_aix.GNU @@ -9,6 +9,9 @@ CC = xlC CXX = xlC_r +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = makeC++SharedLib_r LD = $(CXX) CPPFLAGS += -qxcall -qtempinc diff --git a/include/makeinclude/platform_aix4.2.GNU b/include/makeinclude/platform_aix4.2.GNU index 1e55858eec7..20862eed4c7 100644 --- a/include/makeinclude/platform_aix4.2.GNU +++ b/include/makeinclude/platform_aix4.2.GNU @@ -7,6 +7,9 @@ CC = xlC CXX = xlC_r +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = makeC++SharedLib_r LD = $(CXX) CPPFLAGS += -qxcall -qtempinc -qcheck=nobounds:div:null -M -qlanglvl=ansi -qextchk -qflag=w:w -qinfo diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU index b4a1511d2e1..074b292c05c 100644 --- a/include/makeinclude/platform_chorus.GNU +++ b/include/makeinclude/platform_chorus.GNU @@ -11,11 +11,12 @@ LIB_DIR = $(CLASSIXDIR)/lib CC = gcc CXX = g++ -CFLAGS += -w -O2 -CCFLAGS += -w -O2 -fno-implicit-templates \ +CFLAGS += $(DCFLAGS) -w -O2 +CCFLAGS += $(CFLAGS) -fno-implicit-templates \ -fno-strict-prototypes \ -D_POSIX_THREADS \ -D_POSIX_THREAD_SAFE_FUNCTIONS +DCFLAGS += -g INCLDIRS += -I$(INC_DIR)/posix \ -I$(INC_DIR)/stdc \ diff --git a/include/makeinclude/platform_dgux4_epc.GNU b/include/makeinclude/platform_dgux4_epc.GNU index 7a9fff0abca..241e312a104 100644 --- a/include/makeinclude/platform_dgux4_epc.GNU +++ b/include/makeinclude/platform_dgux4_epc.GNU @@ -2,8 +2,10 @@ # *not* using Orbix CC = gcc CXX = ec++ +CFLAGS += $(DCFLAGS) ## CCFLAGS += -relax -tproff -CCFLAGS += -relax -v -eh +CCFLAGS += $(CFLAGS) -relax -v -eh +DCFLAGS += -g DLD = $(CXX) LIBS += -lgen -lsocket -ldl -lnsl -lc PIC = -KPIC diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU index 352336482f7..bbd8ee00a03 100644 --- a/include/makeinclude/platform_hpux.GNU +++ b/include/makeinclude/platform_hpux.GNU @@ -1,14 +1,15 @@ CC = /bin/cc CXX = /usr/bin/CC +CFLAGS = $(DCFLAGS) -Aa -z +CCFLAGS = $(CFLAGS) -pta -ptb +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) PIC = +Z ARFLAGS = ruv RANLIB = echo -CFLAGS = $(DCFLAGS) -Aa -z LDFLAGS = -L$(WRAPPER_ROOT)/ace -Wl,+s LIBS += -lxti -CCFLAGS = -Aa -pta -ptb -z SOFLAGS = -b SOEXT = sl SOBUILD = @echo ""; \ diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index eb1a899eb47..d680f791b54 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -1,14 +1,15 @@ CC = /bin/cc CXX = /opt/aCC/bin/aCC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) PIC = +Z ARFLAGS = ruv RANLIB = echo -CFLAGS = $(DCFLAGS) LDFLAGS = -L$(WRAPPER_ROOT)/ace -Wl,+s LIBS += -lxti -CCFLAGS = SOFLAGS = -b SOEXT = sl SHLIBBUILD = $(SOLINK.cc) -o $@ $(VSHOBJS1) diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU index 3a85639ee52..8fbd8863d77 100644 --- a/include/makeinclude/platform_hpux_gcc.GNU +++ b/include/makeinclude/platform_hpux_gcc.GNU @@ -1,16 +1,15 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -CCFLAGS += -w -O2 -fno-implicit-templates +CFLAGS += $(DCFLAGS) -w -O2 +CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) PIC = -fPIC ARFLAGS = ruv RANLIB = echo -CFLAGS = $(DCFLAGS) LDFLAGS = -L$(WRAPPER_ROOT)/ace -Wl,+s LIBS += -lxti -CCFLAGS = SOFLAGS = $(CPPFLAGS) -shared -nostdlib SOEXT = sl SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< diff --git a/include/makeinclude/platform_hpux_orbix.GNU b/include/makeinclude/platform_hpux_orbix.GNU index 7fde5f5f05a..c38adae2b36 100644 --- a/include/makeinclude/platform_hpux_orbix.GNU +++ b/include/makeinclude/platform_hpux_orbix.GNU @@ -1,15 +1,16 @@ # Assume the existence of Orbix with HP/UX... CC = /bin/cc CXX = /usr/bin/CC +CFLAGS = $(DCFLAGS) -Aa -z +z +CCFLAGS = $(CFLAGS) -pta -ptb +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) INCLDIRS = -I$(ORBIX_ROOT)/include PIC = ARFLAGS = ruv RANLIB = echo -CFLAGS = -Aa -z +z $(DCFLAGS) LDFLAGS = -L$(ORBIX_ROOT)/lib -L$(WRAPPER_ROOT)/ace -Wl,+s -CCFLAGS = -Aa -z +z -pta -ptb SOFLAGS = -b SOBUILD = @echo ""; \ echo "$(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<"; \ diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU index 8c215de8764..61876735064 100644 --- a/include/makeinclude/platform_irix5.2.GNU +++ b/include/makeinclude/platform_irix5.2.GNU @@ -2,7 +2,9 @@ MAKE = gmake CC = gcc CXX = g++ -CCFLAGS += -O2 -fno-implicit-templates +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU index 82eba502d1f..0d8ea800d08 100644 --- a/include/makeinclude/platform_irix5.3_g++.GNU +++ b/include/makeinclude/platform_irix5.3_g++.GNU @@ -2,7 +2,9 @@ CC = gcc CXX = g++ -CCFLAGS += -O2 -fno-implicit-templates +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(WRAPPER_ROOT)/ace diff --git a/include/makeinclude/platform_irix5.3_sgic++.GNU b/include/makeinclude/platform_irix5.3_sgic++.GNU index 74315b3f4aa..27baf6212a1 100644 --- a/include/makeinclude/platform_irix5.3_sgic++.GNU +++ b/include/makeinclude/platform_irix5.3_sgic++.GNU @@ -6,6 +6,9 @@ CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) CPPFLAGS += -ptused -prelink +pp -woff 3203,3209,3161,3262,3665 diff --git a/include/makeinclude/platform_irix6.2_sgiCC.GNU b/include/makeinclude/platform_irix6.2_sgiCC.GNU index b95c4cb77d9..263418c0bf6 100644 --- a/include/makeinclude/platform_irix6.2_sgiCC.GNU +++ b/include/makeinclude/platform_irix6.2_sgiCC.GNU @@ -7,6 +7,9 @@ CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_irix6.2_sgic++.GNU b/include/makeinclude/platform_irix6.2_sgic++.GNU index 4366ef3f06c..732c1dcf804 100644 --- a/include/makeinclude/platform_irix6.2_sgic++.GNU +++ b/include/makeinclude/platform_irix6.2_sgic++.GNU @@ -11,6 +11,9 @@ CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) CPPFLAGS += -ptused -prelink -D_SGI_MP_SOURCE diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 6e03fbd131f..b4f885d15bc 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -3,8 +3,9 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes +CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 9b563fe2897..4c7915759ff 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -8,8 +8,9 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT +CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 9b563fe2897..4c7915759ff 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -8,8 +8,9 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT +CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index a39d75b6a72..babb8dc2125 100644 --- a/include/makeinclude/platform_linux_pthread.GNU +++ b/include/makeinclude/platform_linux_pthread.GNU @@ -9,8 +9,9 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -lpthreads diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index 06ed589e671..611af933b15 100644 --- a/include/makeinclude/platform_m88k.GNU +++ b/include/makeinclude/platform_m88k.GNU @@ -2,8 +2,9 @@ # *not* using Orbix CC = gcc CXX = g++ -CFLAGS += -w -O2 -CCFLAGS += -w -D__m88k__ -O2 -fno-implicit-templates -fno-strict-prototypes +CFLAGS += $(DCFLAGS) -w -O2 +CCFLAGS += $(CFLAGS) -D__m88k__ -fno-implicit-templates -fno-strict-prototypes +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) INCLDIRS += -I$(WRAPPER_ROOT) -I. diff --git a/include/makeinclude/platform_mvs.GNU b/include/makeinclude/platform_mvs.GNU index 4b9563ce504..9959b45d297 100644 --- a/include/makeinclude/platform_mvs.GNU +++ b/include/makeinclude/platform_mvs.GNU @@ -1,6 +1,9 @@ # For MVS OpenEdition platform CXX = cxx +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g CPPFLAGS = -+ DEFFLAGS = -D_ALL_SOURCE -DNDEBUG CC = $(CXX) diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2.GNU index 1dda8982c21..612ffabf238 100644 --- a/include/makeinclude/platform_osf1_3.2.GNU +++ b/include/makeinclude/platform_osf1_3.2.GNU @@ -2,8 +2,9 @@ CC = cxx CXX = $(CC) -CFLAGS += -non_shared +CFLAGS += $(DCFLAGS) -non_shared CCFLAGS += $(CFLAGS) -x cxx -w0 +DCFLAGS += -g #DLD = ld -non_shared DLD = ld -shared LD = $(CXX) diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU index abb080db414..ebfe1bec164 100644 --- a/include/makeinclude/platform_osf1_4.0.GNU +++ b/include/makeinclude/platform_osf1_4.0.GNU @@ -2,8 +2,9 @@ CC = cxx CXX = $(CC) -CFLAGS += -pthread -ptr $(WRAPPER_ROOT)/ace/cxx_repository +CFLAGS += $(DCFLAGS) -pthread -ptr $(WRAPPER_ROOT)/ace/cxx_repository CCFLAGS += $(CFLAGS) -w0 +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += -pthread -ltli -lrt diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU index a88d64e5654..c26e849a807 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.0_g++.GNU @@ -3,8 +3,9 @@ CC = gcc CXX = g++ -CFLAGS += -D_REENTRANT -O2 -CCFLAGS += -D_REENTRANT -O2 -fno-implicit-templates -fno-strict-prototypes +CFLAGS += $(DCFLAGS) -D_REENTRANT -O2 +CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes +DCFLAGS += -g LD = $(CXX) DLD = $(CXX) LIBS += -lpthread -lmach -lexc -ltli -lrt diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index b10da7e7358..e6032b26cde 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -1,7 +1,8 @@ CC = gcc CXX = g++ -CFLAGS += -w -O2 -CCFLAGS += -w -O2 -fno-implicit-templates -fno-strict-prototypes +CFLAGS += $(DCFLAGS) -w -O2 +CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes +DCFLAGS += -g #### should this be -gstabs? DLD = $(CXX) LD = $(CXX) LIBS = -lsocket diff --git a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU index 51d60d892b9..ee32b823305 100644 --- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU +++ b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU @@ -9,8 +9,10 @@ CC = gcc # LDLIBS += -L $(WRAPPER_ROOT)/ace -L ./ ${MIT_PTHREADS_DIR}/init/init.o -lACE # -z muldefs LDLIBS += -L $(WRAPPER_ROOT)/ace -L ./ -lACE # -z muldefs CXX = g++ -CFLAGS += -b elf -w -O2 -CCFLAGS += -b elf -fpic -Xpg4plus -O2 -fno-implicit-templates -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include +CFLAGS += $(DCFLAGS) -b elf -w -O2 +CCFLAGS += $(DCCFLAGS) -b elf -O2 -fpic -Xpg4plus -fno-implicit-templates -I ${MIT_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include +DCFLAGS += -gstabs +DCCFLAGS += $(DCFLAGS) DLD = $(CXX) LD = $(CXX) LIBS = -L${MIT_PTHREADS_DIR} -lnsl -lpthread diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU index c9ae4d2da9f..76a2930c903 100644 --- a/include/makeinclude/platform_sco5.0.0-nothread.GNU +++ b/include/makeinclude/platform_sco5.0.0-nothread.GNU @@ -2,9 +2,10 @@ CC = gcc CXX = g++ -CFLAGS += -b elf -w -O2 -CCFLAGS += -b elf -w -O2 -Xpg4plus -fno-implicit-templates \ +CFLAGS += $(DCFLAGS) -b elf -w -O2 +CCFLAGS += $(CFLAGS) -Xpg4plus -fno-implicit-templates \ -I/usr/progressive/lib/g++-include +DCFLAGS += -gstabs DLD = $(CXX) LD = $(CXX) LIBS += -lsocket -lnsl -ldl diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index 5e86d453e16..e5d6b2b945c 100644 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ b/include/makeinclude/platform_sunos4_g++.GNU @@ -4,8 +4,9 @@ # CC = gcc CXX = g++ -CFLAGS += -O2 -fno-strict-prototypes -CCFLAGS += -O2 -fno-strict-prototypes -fno-implicit-templates +CFLAGS += $(DCFLAGS) -O2 -fno-strict-prototypes +CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = /bin/ld LD = $(CXX) # diff --git a/include/makeinclude/platform_sunos4_lucid.GNU b/include/makeinclude/platform_sunos4_lucid.GNU index b285daba2d8..6391cb40eb7 100644 --- a/include/makeinclude/platform_sunos4_lucid.GNU +++ b/include/makeinclude/platform_sunos4_lucid.GNU @@ -1,8 +1,10 @@ # SunOS 4.x (Solaris 1.x) with Lucid CC = lcc CXX = lcc -CFLAGS = -Xa # use ANSI c complier -CCFLAGS = -XF -Xpt- # use c++ ARM compiler with auto templates turned off +CFLAGS = $(DCFLAGS) -Xa # use ANSI c complier +CCFLAGS = $(DCCFLAGS) -XF -Xpt- # use c++ ARM compiler with auto templates turned off +DCFLAGS += -g +DCCFLAGS += $(DCFLAGS) DLD = /bin/ld LD = $(CXX) LIBS += diff --git a/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/include/makeinclude/platform_sunos4_sunc++3.x.GNU index 2c4ff016780..3fdd64aed67 100644 --- a/include/makeinclude/platform_sunos4_sunc++3.x.GNU +++ b/include/makeinclude/platform_sunos4_sunc++3.x.GNU @@ -5,6 +5,9 @@ # SunOS 4.x (Solaris 1.x) with SunC++ 3.x CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = /bin/ld LD = $(CXX) LIBS += diff --git a/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/include/makeinclude/platform_sunos4_sunc++4.x.GNU index 79c9adb1dfb..fb362ba5353 100644 --- a/include/makeinclude/platform_sunos4_sunc++4.x.GNU +++ b/include/makeinclude/platform_sunos4_sunc++4.x.GNU @@ -1,6 +1,9 @@ # SunOS 4.x (Solaris 1.x) with SunC++ 4.x CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += diff --git a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU index 6112508e091..6e84e331877 100644 --- a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU +++ b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU @@ -1,6 +1,9 @@ # SunOS 4.x (Solaris 1.x) with SunC++ 4.x and Orbix. CC = cc CXX = CC +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += diff --git a/include/makeinclude/platform_sunos5_centerline.GNU b/include/makeinclude/platform_sunos5_centerline.GNU index 00d83024f4e..0c98272feca 100644 --- a/include/makeinclude/platform_sunos5_centerline.GNU +++ b/include/makeinclude/platform_sunos5_centerline.GNU @@ -1,8 +1,9 @@ # SunOS 5.x (Solaris 2.x) with Centerline C++ CC = cc CXX = CC -CFLAGS += -mt +CFLAGS += $(DCFLAGS) -mt CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) -mt LD = $(CXX) -mt LIBS += -lsocket -ldl -lnsl -lgen diff --git a/include/makeinclude/platform_sunos5_centerline_orbix.GNU b/include/makeinclude/platform_sunos5_centerline_orbix.GNU index 5ee25111d3a..5cd2472ebc0 100644 --- a/include/makeinclude/platform_sunos5_centerline_orbix.GNU +++ b/include/makeinclude/platform_sunos5_centerline_orbix.GNU @@ -1,8 +1,9 @@ # SunOS 5.x (Solaris 2.x) with Centerline C++ CC = cc CXX = CC -CFLAGS += -mt +CFLAGS += $(DCFLAGS) -mt CCFLAGS += $(CFLAGS) +DCFLAGS += -g DLD = $(CXX) -mt LD = $(CXX) -mt INCLDIRS = -I$(ORBIX_ROOT)/include diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index a52027025c4..816d2541a62 100644 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ b/include/makeinclude/platform_sunos5_g++.GNU @@ -4,8 +4,9 @@ # CC = gcc CXX = g++ -CFLAGS += -Wall -Wpointer-arith -O2 #### -Winline -CCFLAGS += -Wall -Wpointer-arith -O2 -fno-implicit-templates #### -Winline +CFLAGS += $(DCFLAGS) -Wall -Wpointer-arith -O2 #### -Winline +CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += # -z muldefs diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 870edce6f8f..c82d1313513 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -17,8 +17,9 @@ # CC = cc CXX = CC -CFLAGS += +w -mt +CFLAGS += $(DCFLAGS) +w -mt CCFLAGS += $(CFLAGS) -noex -pta +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -R $(WRAPPER_ROOT)/ace diff --git a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU index c8c4a71aa6a..c907d8f8cf8 100644 --- a/include/makeinclude/platform_sunos5_sunc++_4.1.GNU +++ b/include/makeinclude/platform_sunos5_sunc++_4.1.GNU @@ -17,7 +17,7 @@ # CC = cc CXX = CC -CFLAGS += -mt #### -xO3 +CFLAGS += $(DCFLAGS) -mt #### -pta instantiates all template members, which makes libraries bigger. #### But, it's supposed to put each member into it's own .o, so executable #### size should not be penalized. @@ -26,7 +26,8 @@ CFLAGS += -mt #### -xO3 #### Sun C++ 4.2 only: #### Dynamic casting and RTTI can coexist with ACE, but it doesn't #### use them. To disable, add: -features=no%castop,no%rtti -CCFLAGS += -mt -noex -pta #### -O3 +CCFLAGS += $(CFLAGS) -noex -pta +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -R $(WRAPPER_ROOT)/ace diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU index d887421d585..9c72e54b9e9 100644 --- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU +++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU @@ -2,8 +2,9 @@ # *using* Orbix CC = cc CXX = CC -CFLAGS += +w -mt +CFLAGS += $(DCFLAGS) +w -mt CCFLAGS += $(CFLAGS) -noex -pta +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) INCLDIRS = -I$(ORBIX_ROOT)/include diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU index b6ba9ee02eb..af22a301279 100644 --- a/include/makeinclude/platform_sunos5_x86_g++.GNU +++ b/include/makeinclude/platform_sunos5_x86_g++.GNU @@ -4,8 +4,9 @@ # CC = gcc CXX = g++ -CFLAGS += -O2 -CCFLAGS += -O2 -fno-implicit-templates -fno-strict-prototypes +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += # -z muldefs diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index dca1804e0ec..865051dcecb 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -4,8 +4,9 @@ # CC = gcc CXX = g++ -CFLAGS += -w -O2 -CCFLAGS += -w -O2 -fno-implicit-templates # -fno-strict-prototypes +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) -fno-implicit-templates # -fno-strict-prototypes +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LDFLAGS += -L/usr/lib diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index 380ed8f7370..fdfef072acf 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -10,8 +10,9 @@ GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 CC = $(BIN_DIR)/g++ppc CXX = $(CC) -CCFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -O2 -CCFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -O2 -fno-implicit-templates +CFLAGS += $(DCFLAGS) -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -O2 +CCFLAGS += $(CFLAGS) -fno-implicit-templates +DCFLAGS += -g INCLDIRS += -I$(TARGET_DIR)/h LD = $(BIN_DIR)/ldppc LDFLAGS += -r -L$(LIB_DIR) -L$(GCCLIB_DIR) diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU index b41de95d3ab..3345a101d75 100644 --- a/include/makeinclude/platform_vxworks5.x_ghs.GNU +++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU @@ -2,7 +2,9 @@ # *not* using Orbix CC = cxvxppc CXX = $(CC) -CCFLAGS += --no_rtti +CFLAGS += $(DCFLAGS) +CCFLAGS += $(CFLAGS) --no_rtti +DCFLAGS += -g DLD = $(CXX) LD = $(CXX) LIBS += /appl/newgreen/vxppc603/indlib.o diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 6de6858aa50..cbafd62cf36 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -58,8 +58,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/platform_macros.GNU #---------------------------------------------------------------------------- CPPFLAGS += $(DEFFLAGS) $(INCLDIRS) -DCFLAGS += -g -DCCFLAGS += -g IDL = idl IDLFLAGS = -s S.cpp -c C.cpp INCLDIRS += -I. -I$(WRAPPER_ROOT) @@ -69,11 +67,10 @@ INSLIB = $(WRAPPER_ROOT)/ace INSMAN = $(WRAPPER_ROOT)/man LDFLAGS += -L$(WRAPPER_ROOT)/ace -L./ LEX = flex -# LINK_COMMAND = quantify -cache-dir=/tmp/quantify OCFLAGS += -O OCCFLAGS += -O -PCFLAGS += # -p -PCCFLAGS += # -p +PCFLAGS += #### set in platform_macros.GNU file, e.g., -p +PCCFLAGS += #### set in platform_macros.GNU file, e.g., -p RM = /bin/rm VAR = VDIR = .obj/ @@ -110,12 +107,11 @@ CCFLAGS += $(PCCFLAGS) else ifdef optimize -CFLAGS += $(OCFLAGS) #-DNDEBUG -CCFLAGS += $(OCCFLAGS) #-DNDEBUG +CFLAGS += $(OCFLAGS) -DNDEBUG +CCFLAGS += $(OCCFLAGS) -DNDEBUG else # default settings -CFLAGS += $(DCFLAGS) #-DNDEBUG -CCFLAGS += $(DCCFLAGS) #-DNDEBUG + endif # optimize endif # profile endif # debug @@ -134,8 +130,8 @@ ifdef purify PRELINK += purify -best-effort -cache-dir=/tmp/purifycache -chain-length=20 -inuse-at-exit -fds-inuse-at-exit=no endif # purify -COMPILE.c =$(CC) $(CFLAGS) $(CPPFLAGS) -c -COMPILE.cc =$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c +COMPILE.c =$(CC) $(CFLAGS) $(CPPFLAGS) -c +COMPILE.cc =$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c # 960905 Marius Kjeldahl <marius@funcom.com> # Added the line below to be used for compiling executable shared objects COMPILEESO.cc =$(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) |