diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-10 16:47:31 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-10 16:47:31 +0000 |
| commit | 52f7b535227f816b7e2c839fc24ae06a0c22a9f5 (patch) | |
| tree | bb816c3b6d9fe74ce5455d4c57e84dfa97bc325e /include | |
| parent | 1a205baf65d10c42b64b44246bcb66e971f4a5ff (diff) | |
| download | ATCD-52f7b535227f816b7e2c839fc24ae06a0c22a9f5.tar.gz | |
replace CFLAGS += DCFLAGS with debug=1, and added support for debug=0, etc., in wrapper_macros.GNU.
Diffstat (limited to 'include')
40 files changed, 191 insertions, 88 deletions
diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU index 7d0d02df0be..41162b868a1 100644 --- a/include/makeinclude/platform_aix.GNU +++ b/include/makeinclude/platform_aix.GNU @@ -7,11 +7,12 @@ # separate product (free to AIX licensees) called shared library # hookable symbols (or slhs/6000). If they don't have this patch, the # sv* commands for compiling and linking will not be present on the -# system. +# system. + +debug = 1 CC = xlC CXX = xlC_r -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = makeC++SharedLib_r diff --git a/include/makeinclude/platform_aix4.2.GNU b/include/makeinclude/platform_aix4.2.GNU index 06a2781d8e8..96becb065ac 100644 --- a/include/makeinclude/platform_aix4.2.GNU +++ b/include/makeinclude/platform_aix4.2.GNU @@ -7,9 +7,10 @@ # apply the update available at: # ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff +debug = 1 + CC = xlC CXX = xlC_r -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = makeC++SharedLib_r diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU index 82a7f015191..65af9a57eb0 100644 --- a/include/makeinclude/platform_chorus.GNU +++ b/include/makeinclude/platform_chorus.GNU @@ -2,6 +2,8 @@ # Chorus 3.1b with GNU g++ 2.7.2 +debug = 1 + include $(CLASSIXDIR)/dtool/htgt-cf.rf INC_DIR = $(CLASSIXDIR)/include BIN_DIR = @@ -9,7 +11,7 @@ LIB_DIR = $(CLASSIXDIR)/lib #CC = gcc #CXX = g++ CXX = $(CC) -CFLAGS += $(DCFLAGS) -w -O2 +CFLAGS += -w -O2 CCFLAGS += $(CFLAGS) -fno-implicit-templates \ -fno-strict-prototypes \ -nostdinc \ diff --git a/include/makeinclude/platform_dgux4_epc.GNU b/include/makeinclude/platform_dgux4_epc.GNU index b007d4e7228..7af2281d13a 100644 --- a/include/makeinclude/platform_dgux4_epc.GNU +++ b/include/makeinclude/platform_dgux4_epc.GNU @@ -2,9 +2,11 @@ # SunOS 5.x (Solaris 2.x) with SunC++ 4.x # *not* using Orbix + +debug = 1 + CC = gcc CXX = ec++ -CFLAGS += $(DCFLAGS) ## CCFLAGS += -relax -tproff CCFLAGS += $(CFLAGS) -relax -v -eh DCFLAGS += -g diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU index 4a442b1a232..ea79a5ba9b8 100644 --- a/include/makeinclude/platform_freebsd.GNU +++ b/include/makeinclude/platform_freebsd.GNU @@ -5,9 +5,11 @@ # ***** Notice: This file is still under testing. ***** # To be used on FreeBSD platform without pthread support. +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes +CFLAGS += -w -O2 -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = ld diff --git a/include/makeinclude/platform_freebsd_pthread.GNU b/include/makeinclude/platform_freebsd_pthread.GNU index 09f67375f66..893ead3edad 100644 --- a/include/makeinclude/platform_freebsd_pthread.GNU +++ b/include/makeinclude/platform_freebsd_pthread.GNU @@ -13,9 +13,11 @@ # instruction to build your own. You must have at least 3.0-current as # of 2/9/1997 to take advantage of the latest feature of pthread library. +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes -D_POSIX_THREADS +CFLAGS += -w -O2 -fno-strict-prototypes -D_POSIX_THREADS CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = ld diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU index 6ee3ca66b75..ed28f67ae31 100644 --- a/include/makeinclude/platform_hpux.GNU +++ b/include/makeinclude/platform_hpux.GNU @@ -1,5 +1,7 @@ # $Id$ -# + +debug = 1 + # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) @@ -7,7 +9,7 @@ HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) CC = /bin/cc CXX = /usr/bin/CC -pta -ti,/bin/true -tr,/bin/true -CFLAGS = $(DCFLAGS) -Aa -z +CFLAGS = -Aa -z CCFLAGS = $(CFLAGS) DCFLAGS += -g -DHPUX_VERS=$(HPUX_VERS) DLD = /usr/bin/CC diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU index 5b75ef35907..a48d4da8df0 100644 --- a/include/makeinclude/platform_hpux_aCC.GNU +++ b/include/makeinclude/platform_hpux_aCC.GNU @@ -5,14 +5,15 @@ # is a line to verify in this file - if you are using DCE threads, "-lcma" # needs to be on the SHLIBBUILD line, below. If you are not using DCE threads, # then use the SHLIBBUILD without -lcma. -# + +debug = 1 + # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) # CC = /bin/cc CXX = /opt/aCC/bin/aCC -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g -D_THREAD_SAFE -D_REENTRANT -DHPUX_VERS=$(HPUX_VERS) DLD = $(CXX) @@ -21,7 +22,6 @@ PIC = +Z ARFLAGS = ruv RANLIB = echo LDFLAGS = -Wl,+s -#LIBS += PRELIB = $(CXX) -c -g +inst_close $^ PRELIB_USES_OBJ_ONLY = 1 SOFLAGS = -b +inst_none -g diff --git a/include/makeinclude/platform_hpux_gcc.GNU b/include/makeinclude/platform_hpux_gcc.GNU index 34e5fc1668f..5a395c8341a 100644 --- a/include/makeinclude/platform_hpux_gcc.GNU +++ b/include/makeinclude/platform_hpux_gcc.GNU @@ -1,12 +1,15 @@ # $Id$ # + +debug = 1 + # First, extract the OS version number. HPVERS_WORDS := $(subst ., ,$(shell uname -r)) HPUX_VERS := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS))) # CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 +CFLAGS += -w -O2 CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g -DHPUX_VERS=$(HPUX_VERS) DLD = $(CXX) diff --git a/include/makeinclude/platform_hpux_orbix.GNU b/include/makeinclude/platform_hpux_orbix.GNU index 338a6106adc..fa05720bf14 100644 --- a/include/makeinclude/platform_hpux_orbix.GNU +++ b/include/makeinclude/platform_hpux_orbix.GNU @@ -1,9 +1,12 @@ # $Id$ # Assume the existence of Orbix with HP/UX... + +debug = 1 + CC = /bin/cc CXX = /usr/bin/CC -CFLAGS = $(DCFLAGS) -Aa -z +z +CFLAGS = -Aa -z +z CCFLAGS = $(CFLAGS) -pta -ptb DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_irix5.2.GNU b/include/makeinclude/platform_irix5.2.GNU index ea99b0f674f..d5668ee6c22 100644 --- a/include/makeinclude/platform_irix5.2.GNU +++ b/include/makeinclude/platform_irix5.2.GNU @@ -1,10 +1,12 @@ # $Id$ # Irix 5.2 with gcc 2.6.1 + +debug = 1 + MAKE = gmake CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_irix5.3_g++.GNU b/include/makeinclude/platform_irix5.3_g++.GNU index de4b02dfde8..22f49da78b4 100644 --- a/include/makeinclude/platform_irix5.3_g++.GNU +++ b/include/makeinclude/platform_irix5.3_g++.GNU @@ -2,9 +2,10 @@ # Irix 5.3 with GNU C++ +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) -O2 -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_irix5.3_sgic++.GNU b/include/makeinclude/platform_irix5.3_sgic++.GNU index 5d81afccb0f..41b1e831b3e 100644 --- a/include/makeinclude/platform_irix5.3_sgic++.GNU +++ b/include/makeinclude/platform_irix5.3_sgic++.GNU @@ -6,9 +6,10 @@ # ACE code but should not matter. The warnings can be turned on # again by removing the -woff clause in the CPPFLAGS definition. +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 85d74b6c3f7..fc2216f0e2e 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -3,9 +3,11 @@ # According to Bryon G. Rigg <bgrigg@opus.bcbnet.com>, this file # should allow ACE to be built on Linux. +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes +CFLAGS += -w -O2 -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 419b3d49205..53f71abccd9 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -8,9 +8,11 @@ # to compile it yourself (no binaries included) -- # Jan Rychter <jwr@icm.edu.pl> +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT +CFLAGS += -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g -O3 DLD = $(CXX) diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 419b3d49205..53f71abccd9 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -8,9 +8,11 @@ # to compile it yourself (no binaries included) -- # Jan Rychter <jwr@icm.edu.pl> +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT +CFLAGS += -Wall -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g -O3 DLD = $(CXX) diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index 299f98d78d1..8939d2a246f 100644 --- a/include/makeinclude/platform_linux_pthread.GNU +++ b/include/makeinclude/platform_linux_pthread.GNU @@ -9,9 +9,11 @@ # to compile it yourself (no binaries included) -- # Jan Rychter <jwr@icm.edu.pl> +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CFLAGS += -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) diff --git a/include/makeinclude/platform_m88k.GNU b/include/makeinclude/platform_m88k.GNU index 27fe7f837fa..ab8dbd5e93b 100644 --- a/include/makeinclude/platform_m88k.GNU +++ b/include/makeinclude/platform_m88k.GNU @@ -2,9 +2,12 @@ # SunOS 5.x (Solaris 2.x) with SunC++ 4.x # *not* using Orbix + +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 +CFLAGS += -w -O2 CCFLAGS += $(CFLAGS) -D__m88k__ -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_mvs.GNU b/include/makeinclude/platform_mvs.GNU index 9dfc05479eb..eea540f42e5 100644 --- a/include/makeinclude/platform_mvs.GNU +++ b/include/makeinclude/platform_mvs.GNU @@ -1,9 +1,10 @@ # $Id$ # For MVS OpenEdition platform + +debug = 1 CXX = cxx -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g CPPFLAGS = -+ diff --git a/include/makeinclude/platform_osf1_3.2.GNU b/include/makeinclude/platform_osf1_3.2.GNU index e7bda25309b..ede38c6ab89 100644 --- a/include/makeinclude/platform_osf1_3.2.GNU +++ b/include/makeinclude/platform_osf1_3.2.GNU @@ -2,9 +2,11 @@ # This platform macros file is intended to work with Digital UNIX 3.2 (OSF/1 3.2). +debug = 1 + CC = cxx CXX = $(CC) -CFLAGS += $(DCFLAGS) -ptr $(ACE_ROOT)/ptrepository +CFLAGS += -ptr $(ACE_ROOT)/ptrepository CCFLAGS += $(CFLAGS) -x cxx -w0 DCFLAGS += -g -threads DLD = ld -shared -expect_unresolved '*' diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU index eb49045560f..7a663669bbd 100644 --- a/include/makeinclude/platform_osf1_4.0.GNU +++ b/include/makeinclude/platform_osf1_4.0.GNU @@ -3,9 +3,11 @@ # This platform macros file is intended to work with # Digital UNIX 4.0 (OSF/1 4.0). +debug = 1 + CC = cxx CXX = $(CC) -CFLAGS += $(DCFLAGS) -pthread -ptr ptrepository +CFLAGS += -pthread -ptr ptrepository CCFLAGS += $(CFLAGS) -w0 DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU index e9e97e4a8f1..d9b4363e475 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.0_g++.GNU @@ -3,9 +3,11 @@ # This platform macros file is intended to work with Digital UNIX 4.0 # (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer). +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -D_REENTRANT -O2 +CFLAGS += -D_REENTRANT -O2 CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g LD = $(CXX) diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index ca5fec1099c..59cd955679c 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -1,8 +1,10 @@ # $Id$ +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -w -O2 +CFLAGS += -w -O2 CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g #### should this be -gstabs? DLD = $(CXX) diff --git a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU index bebf1aed9cd..7dbb02e4d84 100644 --- a/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU +++ b/include/makeinclude/platform_sco5.0.0-fsu-pthread.GNU @@ -3,6 +3,9 @@ # Requires FSU pthreads and gcc 2.7.2 installed in /usr/progressive # to produce libACE.so correctly changed the specs file for gcc 2.7.2 # for not link -lc and -lgcc and other not shared libraries + +debug = 1 + CC = gcc # for threads # for no threads @@ -11,8 +14,8 @@ CC = gcc # LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${FSU_PTHREADS_DIR}/init/init.o -lACE # -z muldefs LDLIBS += -L $(ACE_ROOT)/ace # -z muldefs CXX = g++ -CFLAGS += $(DCFLAGS) -b elf -w -O2 -CCFLAGS += $(DCCFLAGS) -b elf -O2 -fpic -Xpg4plus -fno-implicit-templates -I ${FSU_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include +CFLAGS += -b elf -w -O2 +CCFLAGS += -b elf -O2 -fpic -Xpg4plus -fno-implicit-templates -I ${FSU_PTHREADS_DIR}/include -I /usr/progressive/lib/g++-include DCFLAGS += -gstabs DCCFLAGS += $(DCFLAGS) DLD = $(CXX) diff --git a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU index 04c3f358c62..180bc005937 100644 --- a/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU +++ b/include/makeinclude/platform_sco5.0.0-mit-pthread.GNU @@ -3,6 +3,9 @@ # Requires MIT pthreads and gcc 2.7.2 installed in /usr/progressive # to produce libACE.so correctly changed the specs file for gcc 2.7.2 # for not link -lc and -lgcc and other not shared libraries + +debug = 1 + CC = gcc # for threads # for no threads @@ -11,8 +14,8 @@ CC = gcc # LDLIBS += -L $(ACE_ROOT)/ace -L ./ ${MIT_PTHREADS_DIR}/init/init.o -lACE # -z muldefs LDLIBS += -L $(ACE_ROOT)/ace -L ./ -lACE # -z muldefs CXX = g++ -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 +CFLAGS += -b elf -w -O2 +CCFLAGS += -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) diff --git a/include/makeinclude/platform_sco5.0.0-nothread.GNU b/include/makeinclude/platform_sco5.0.0-nothread.GNU index 028488a72de..2fcf20842d7 100644 --- a/include/makeinclude/platform_sco5.0.0-nothread.GNU +++ b/include/makeinclude/platform_sco5.0.0-nothread.GNU @@ -2,9 +2,11 @@ # SCO v5.0.2; gcc version 2.7-95q4(Skunkware96 distribution from media images) +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -b elf -w -O2 +CFLAGS += -b elf -w -O2 CCFLAGS += $(CFLAGS) -Xpg4plus -fno-implicit-templates \ -I/usr/progressive/lib/g++-include DCFLAGS += -gstabs diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index a5d2472c4f3..b4927fc3ab9 100644 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ b/include/makeinclude/platform_sunos4_g++.GNU @@ -1,12 +1,12 @@ # $Id$ # SunOS 4.x (Solaris 1.x) with g++ *not* using Orbix -# -# SOBUILD - compile into .so directly -# + +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -O2 -fno-strict-prototypes +CFLAGS += -O2 -fno-strict-prototypes CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = /bin/ld @@ -18,6 +18,7 @@ AR = ar ARFLAGS = ruv RANLIB = ranlib SOFLAGS = -assert pure-text +# SOBUILD - compile into .so directly SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< # SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $< PRELIB = @true diff --git a/include/makeinclude/platform_sunos4_lucid.GNU b/include/makeinclude/platform_sunos4_lucid.GNU index 66aeec69d10..a6efedcf796 100644 --- a/include/makeinclude/platform_sunos4_lucid.GNU +++ b/include/makeinclude/platform_sunos4_lucid.GNU @@ -1,10 +1,13 @@ # $Id$ # SunOS 4.x (Solaris 1.x) with Lucid + +debug = 1 + CC = lcc CXX = lcc -CFLAGS = $(DCFLAGS) -Xa # use ANSI c complier -CCFLAGS = $(DCCFLAGS) -XF -Xpt- # use c++ ARM compiler with auto templates turned off +CFLAGS = -Xa # use ANSI c complier +CCFLAGS = -XF -Xpt- # use c++ ARM compiler with auto templates turned off DCFLAGS += -g DCCFLAGS += $(DCFLAGS) DLD = /bin/ld diff --git a/include/makeinclude/platform_sunos4_sunc++3.x.GNU b/include/makeinclude/platform_sunos4_sunc++3.x.GNU index 2418fac3528..a00eb562e11 100644 --- a/include/makeinclude/platform_sunos4_sunc++3.x.GNU +++ b/include/makeinclude/platform_sunos4_sunc++3.x.GNU @@ -1,13 +1,13 @@ # $Id$ -# SunOS 4.x with SunC++ 3.x (note that this is a very old C++ +# SunOS 4.x (Solaris 1.x) with SunC++ 3.x (note that this is a very old C++ # compiler, based on cfront. In paricular, it's not the same thing as # SunC++ 4.x (which is also known as SPARCWorks 3.x). -# SunOS 4.x (Solaris 1.x) with SunC++ 3.x +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = /bin/ld diff --git a/include/makeinclude/platform_sunos4_sunc++4.x.GNU b/include/makeinclude/platform_sunos4_sunc++4.x.GNU index 57024253f93..45aa338f6f2 100644 --- a/include/makeinclude/platform_sunos4_sunc++4.x.GNU +++ b/include/makeinclude/platform_sunos4_sunc++4.x.GNU @@ -1,9 +1,11 @@ # $Id$ # SunOS 4.x (Solaris 1.x) with SunC++ 4.x + +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU index 85e03484e2c..84ebb7e4991 100644 --- a/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU +++ b/include/makeinclude/platform_sunos4_sunc++4.x_orbix.GNU @@ -1,9 +1,11 @@ # $Id$ # SunOS 4.x (Solaris 1.x) with SunC++ 4.x and Orbix. + +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_sunos5_centerline.GNU b/include/makeinclude/platform_sunos5_centerline.GNU index 0693a5acc34..0d8cc04c666 100644 --- a/include/makeinclude/platform_sunos5_centerline.GNU +++ b/include/makeinclude/platform_sunos5_centerline.GNU @@ -1,9 +1,12 @@ # $Id$ # SunOS 5.x (Solaris 2.x) with Centerline C++ + +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) -mt +CFLAGS += -mt CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) -mt diff --git a/include/makeinclude/platform_sunos5_centerline_orbix.GNU b/include/makeinclude/platform_sunos5_centerline_orbix.GNU index 55f3ac90ac6..7265e806673 100644 --- a/include/makeinclude/platform_sunos5_centerline_orbix.GNU +++ b/include/makeinclude/platform_sunos5_centerline_orbix.GNU @@ -1,9 +1,12 @@ # $Id$ # SunOS 5.x (Solaris 2.x) with Centerline C++ + +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) -mt +CFLAGS += -mt CCFLAGS += $(CFLAGS) DCFLAGS += -g DLD = $(CXX) -mt diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index ea99dee31c7..9a52ef1c1c1 100644 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ b/include/makeinclude/platform_sunos5_g++.GNU @@ -1,9 +1,12 @@ # $Id$ # SunOS 5.x (Solaris 2.x) with g++ *not* using Orbix + +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -Wall -Wpointer-arith -O2 -pipe #### -Winline +CFLAGS += -Wall -Wpointer-arith -O2 -pipe #### -Winline CCFLAGS += $(CFLAGS) -fno-implicit-templates DCFLAGS += -g DLD = $(CXX) diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 60371914d0c..2f5515e78a5 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -15,10 +15,12 @@ # 3) "Warning: <foo> hides the function " or "hides the same name in an # outer scope". A useful warning, perhaps, but not really a problem. # There should be no other warnings from Sun C++ when building ACE. -# + +debug = 1 + CC = cc CXX = CC -CFLAGS += $(DCFLAGS) -mt +CFLAGS += -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. diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU index b55d32c892c..7ce00b6df95 100644 --- a/include/makeinclude/platform_sunos5_x86_g++.GNU +++ b/include/makeinclude/platform_sunos5_x86_g++.GNU @@ -1,12 +1,11 @@ # $Id$ # SunOS 5.x (Solaris 2.x) with g++ *not* using Orbix -# -# SOBUILD - compile into .so directly -# + +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) -fno-implicit-templates -fno-strict-prototypes DCFLAGS += -g DLD = $(CXX) @@ -18,6 +17,7 @@ AR = ar ARFLAGS = ruv RANLIB = /bin/true SOFLAGS = -G $(CPPFLAGS) +# SOBUILD - compile into .so directly SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< # SOLINK = cp $< $@ # SOLINK = ln -s $< $@ diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index b7eab4c31e0..61ba91b2b2b 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -1,12 +1,12 @@ # $Id$ # UnixWare V2.2.1.2 with g++ version 2.7.2.2 *not* using Orbix -# -# SOBUILD - compile into .so directly -# + +debug = 1 + CC = gcc CXX = g++ -CFLAGS += $(DCFLAGS) -I/usr/include -D__STDC__=0 #-w +CFLAGS += -I/usr/include -D__STDC__=0 #-w CCFLAGS += $(CFLAGS) -fno-implicit-templates # -fno-strict-prototypes DCFLAGS += -g DLD = $(CXX) @@ -19,6 +19,7 @@ ARFLAGS = ruv RANLIB = /bin/true #SOFLAGS = -assert pure-text SOFLAGS = -shared +# SOBUILD - compile into .so directly SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< # SOLINK = $(SOLINK.cc) -o $@ $(LDFLAGS) $< PRELIB = @true diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index a21899a658a..8cfe3e4ed0d 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -9,6 +9,9 @@ #### add a global variable or function to that .cpp file. See #### ace/IOStream_T.cpp for an explanation and example. +debug = 1 +static_libs_only = 1 + #### BEGIN CPU-specific settings @@ -50,7 +53,7 @@ CFLAGS += -DVXWORKS -D_REENTRANT -I. -I$(ACE_ROOT) -I$(WIND_BASE)/targe #### g++ cygnus-2.7.2-960126 for pc486 target. Some #### member functions don't get instantiated. Wind River knows #### about this problem (SPR 8483). -CCFLAGS += $(DCFLAGS) $(CFLAGS) #### -fno-implicit-templates +CCFLAGS += $(CFLAGS) #### -fno-implicit-templates DCFLAGS += -g INCLDIRS += LD = ld$(TOOLENV) @@ -61,9 +64,6 @@ ARFLAGS = rv RANLIB = /bin/true PRELINK = nm$(TOOLENV) .obj/$@.o $(ACE_ROOT)/ace/libACE.a | munch | egrep -v '\.cpp' > __ctordtor.c; $(COMPILE.c) -traditional -o .obj/__ctordtor.o __ctordtor.c; /bin/rm __ctordtor.c; -#### don't build shared objects: -static_libs_only = 1 - #### ld can't handle INCLDIRS, so override LINK definitions. LINK.c = override LINK.c.override = $(LD) $(LDFLAGS) $(LDLIBS) $(LIBS) diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU index 6b892bf5add..a7fa4546ae3 100644 --- a/include/makeinclude/platform_vxworks5.x_ghs.GNU +++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU @@ -2,9 +2,11 @@ # VxWorks 5.2-5.3.1 with Green Hills 1.8.8 +debug = 1 +static_libs_only = 1 + CC = cxvxppc CXX = $(CC) -CFLAGS += $(DCFLAGS) CCFLAGS += $(CFLAGS) --no_rtti -tnone DCFLAGS += -g DLD = $(CXX) @@ -15,6 +17,3 @@ PIC = AR = ax ARFLAGS = rv RANLIB = /bin/true - -#### don't build shared objects: -static_libs_only = 1 diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index e054ff207b7..dd59d6ac605 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -1,4 +1,4 @@ ->#---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- # $Id$ #---------------------------------------------------------------------------- # @@ -68,14 +68,14 @@ # ACE_ROOT Pathname for the root of the build tree # #---------------------------------------------------------------------------- -# Platform-dependent macro definitions -# (link to the appropriate platform-specific config file). +# Platform-dependent macro definitions +# (link to the appropriate platform-specific config file). #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU #---------------------------------------------------------------------------- -# Platform-independent macro definitions +# Platform-independent macro definitions #---------------------------------------------------------------------------- CPPFLAGS += $(DEFFLAGS) $(INCLDIRS) @@ -106,28 +106,48 @@ endif # VSHDIR YACC = yacc #---------------------------------------------------------------------------- -# Conditional macro definitions +# make flags #---------------------------------------------------------------------------- -ifdef debug -CFLAGS += $(DCFLAGS) -CCFLAGS += $(DCCFLAGS) +ifeq ($(optimize),0) + override optimize = +endif # optimize -else -ifdef profile -CFLAGS += $(PCFLAGS) -CCFLAGS += $(PCCFLAGS) +ifneq ($(optimize),) + #### Disable debug, unconditionally. + override debug = + CFLAGS += $(OCFLAGS) + CCFLAGS += $(OCCFLAGS) +endif # optimize +ifeq ($(debug),0) + override debug = +endif # debug + +ifeq ($(debug),) + CFLAGS += -DACE_NDEBUG + CCFLAGS += -DACE_NDEBUG else -ifdef optimize -CFLAGS += $(OCFLAGS) -DNDEBUG -CCFLAGS += $(OCCFLAGS) -DNDEBUG + CFLAGS += $(DCFLAGS) + CCFLAGS += $(DCCFLAGS) +endif # debug -else # default settings +ifeq ($(profile),0) + override profile = +endif # profile -endif # optimize +ifneq ($(profile),) + CFLAGS += $(PCFLAGS) + CCFLAGS += $(PCCFLAGS) endif # profile -endif # debug + + +ifeq ($(shared_libs_only),0) + override shared_libs_only = +endif # shared_libs_only +ifeq ($(static_libs_only),0) + override static_libs_only = +endif # static_libs_only ifdef shared_libs_only #### don't build static objects: @@ -156,12 +176,10 @@ else VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS) endif # SHLIBA -ifdef quantify - #### You might want to adjust the Quantify options below. - #### -best-effort is undocumented but supported, and seems - #### to help avoid occasional link failure. - PRELINK += quantify -best-effort -cache-dir=/tmp/purifycache -max_threads=100 -endif # quantify + +ifeq ($(purify),0) + override purify = +endif # purify ifdef purify #### You might want to adjust the Purify options below. @@ -173,6 +191,22 @@ ifdef purify -max_threads=100 endif # purify +ifeq ($(quantify),0) + override quantify = +endif # quantify + +ifdef quantify + #### You might want to adjust the Quantify options below. + #### -best-effort is undocumented but supported, and seems + #### to help avoid occasional link failure. + PRELINK += quantify -best-effort -cache-dir=/tmp/purifycache -max_threads=100 +endif # quantify + + +#---------------------------------------------------------------------------- +# Conditional macro definitions +#---------------------------------------------------------------------------- + COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c COMPILE.cc = $(CXX) $(CCFLAGS) $(CPPFLAGS) $(PTDIRS) -c # 960905 Marius Kjeldahl <marius@funcom.com> |