From 3f79faccca401acb2cb273eac60dd1e08440bf9b Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 22 Mar 2001 21:19:59 +0000 Subject: [PATCH] Rearanged OP_SYS and ARCH_DEP definitions. --- configure/CONFIG.gnuCommon | 6 ++++-- configure/os/CONFIG.Common.UnixCommon | 6 ++---- configure/os/CONFIG.Common.hpux-parisc | 8 ++++---- configure/os/CONFIG.Common.linux-x86 | 10 ++++++---- configure/os/CONFIG.Common.osf-alpha | 4 ++-- configure/os/CONFIG.Common.solaris-sparc | 4 ++-- configure/os/CONFIG.Common.solaris-x86 | 5 +++-- configure/os/CONFIG.Common.sun4-x86 | 6 ++++-- 8 files changed, 27 insertions(+), 22 deletions(-) diff --git a/configure/CONFIG.gnuCommon b/configure/CONFIG.gnuCommon index b0b9670e3..96b8b5c20 100644 --- a/configure/CONFIG.gnuCommon +++ b/configure/CONFIG.gnuCommon @@ -19,7 +19,8 @@ CONFORM_CFLAGS_STRICT = -ansi -pedantic CONFORM_CFLAGS_TRAD = -traditional WARN_CFLAGS_YES = -Wall WARN_CFLAGS_NO = -w -OPT_CFLAGS_YES = -g -O3 +#OPT_CFLAGS_YES = -g -O3 +OPT_CFLAGS_YES = -O3 OPT_CFLAGS_NO = -g # Template instantiation c++ flags @@ -31,7 +32,8 @@ CONFORM_CXXFLAGS_STRICT = -ansi -pedantic #WARN_CXXFLAGS_YES = -Wall -Weffc++ WARN_CXXFLAGS_YES = -Wall WARN_CXXFLAGS_NO = -w -OPT_CXXFLAGS_YES = -g -O3 +#OPT_CXXFLAGS_YES = -g -O3 +OPT_CXXFLAGS_YES = -O3 OPT_CXXFLAGS_NO = -g STATIC_LDFLAGS_YES = -static diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index efa9626c9..c5e6253a0 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -59,10 +59,8 @@ DEPLIB_LDLIBS = $($*_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ #-------------------------------------------------- # Operating system definitions -OP_SYS_INCLUDES = -OP_SYS_CPPFLAGS = -DUNIX -OP_SYS_LDFLAGS = -OP_SYS_LDLIBS = -lm +OP_SYS_CPPFLAGS += -DUNIX +OP_SYS_LDLIBS += -lm #-------------------------------------------------- # Link definitions diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc index f07121601..32aae2f5d 100644 --- a/configure/os/CONFIG.Common.hpux-parisc +++ b/configure/os/CONFIG.Common.hpux-parisc @@ -21,10 +21,10 @@ POSIX_LDLIBS_NO += ###################################################### # +DAportable causes portable object code to be created for execution # on different PA-Risc machines -ARCH_DEP_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX -ARCH_DEP_CFLAGS = +DAportable +z -ARCH_DEP_CXXFLAGS = +DAportable +z -ARCH_DEP_LDLIBS += +OP_SYS_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX +OP_SYS_CFLAGS = +DAportable +z +OP_SYS_CXXFLAGS = +DAportable +z +OP_SYS_LDLIBS += SHRLIB_SUFFIX = .sl diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86 index 85183d751..e9a9ae998 100644 --- a/configure/os/CONFIG.Common.linux-x86 +++ b/configure/os/CONFIG.Common.linux-x86 @@ -21,10 +21,12 @@ POSIX_LDLIBS_YES = -lpthread POSIX_LDLIBS_NO = # -D_BSD_SOURCE for gethostname() in unistd.h as needed by cacChannelIO.cpp. -ARCH_DEP_CPPFLAGS += -D_BSD_SOURCE -ARCH_DEP_CPPFLAGS += -D_X86_ -Dlinux -ARCH_DEP_LDFLAGS = -ARCH_DEP_LDLIBS = -lreadline -lcurses -lrt +OP_SYS_CPPFLAGS += -D_BSD_SOURCE +OP_SYS_CPPFLAGS += -Dlinux +OP_SYS_LDFLAGS = +OP_SYS_LDLIBS = -lreadline -lcurses -lrt + +ARCH_DEP_CPPFLAGS += -D_X86_ ifdef CROSS GNU_TARGET=i586-pc-linux-gnu diff --git a/configure/os/CONFIG.Common.osf-alpha b/configure/os/CONFIG.Common.osf-alpha index af83a7e54..b1afe238d 100644 --- a/configure/os/CONFIG.Common.osf-alpha +++ b/configure/os/CONFIG.Common.osf-alpha @@ -20,8 +20,8 @@ POSIX_LDLIBS_YES += POSIX_CPPFLAGS_NO = POSIX_LDLIBS_NO += -ARCH_DEP_CPPFLAGS = -D_OSF_SOURCE -ARCH_DEP_LDLIBS += +OP_SYS_CPPFLAGS = -D_OSF_SOURCE +OP_SYS_LDLIBS += ifdef CROSS GNU_TARGET=alpha-osf diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index daf32c536..558d5551e 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -26,9 +26,9 @@ POSIX_LDLIBS_YES += -lposix4 -lpthread -lthread POSIX_CPPFLAGS_NO = POSIX_LDLIBS_NO += -ARCH_DEP_CPPFLAGS = -DSOLARIS +OP_SYS_CPPFLAGS = -DSOLARIS # socket and nsl needed by libca.a -ARCH_DEP_LDLIBS += -lsocket -lnsl +OP_SYS_LDLIBS += -lsocket -lnsl # -R does not work unless full path names are specified # use loader's -R option diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index 5f5b50654..415ee7963 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -26,9 +26,10 @@ POSIX_LDLIBS_YES += -lposix4 -lpthread POSIX_CPPFLAGS_NO = POSIX_LDLIBS_NO += -ARCH_DEP_CPPFLAGS = -DSOLARIS -D_X86_ +OP_SYS_CPPFLAGS = -DSOLARIS +ARCH_DEP_CPPFLAGS = -D_X86_ # socket and nsl needed by libca.a -ARCH_DEP_LDLIBS += -lsocket -lnsl +OP_SYS_LDLIBS += -lsocket -lnsl ifdef CROSS GNU_TARGET=x86-sun-solaris2 diff --git a/configure/os/CONFIG.Common.sun4-x86 b/configure/os/CONFIG.Common.sun4-x86 index 3fff73bad..1c46d5f08 100644 --- a/configure/os/CONFIG.Common.sun4-x86 +++ b/configure/os/CONFIG.Common.sun4-x86 @@ -20,8 +20,10 @@ POSIX_LDLIBS_YES += -lpthread -lthread POSIX_CPPFLAGS_NO = POSIX_LDLIBS_NO += -ARCH_DEP_CPPFLAGS = -DSUNOS4 -ARCH_DEP_LDLIBS += -lsocket -lnsl +OP_SYS_CPPFLAGS = -DSUNOS4 +OP_SYS_LDLIBS += -lsocket -lnsl + +ARCH_DEP_CPPFLAGS += -D_X86_ ifdef CROSS GNU_TARGET=x86-sun-sunos4