From 0d088667a65c39f34a2fce1b0ef03bc99b4ff501 Mon Sep 17 00:00:00 2001 From: legendre Date: Thu, 24 Jun 2004 22:27:39 +0000 Subject: [PATCH] Moved file paths to make.config.local --- dyner/i386-unknown-linux2.4/Makefile | 2 +- dyner/make.module.tmpl | 4 +- dyninstAPI/i386-unknown-linux2.4/Makefile | 13 +- dyninstAPI/ia64-unknown-linux2.4/Makefile | 17 +- dyninstAPI_RT/i386-unknown-linux2.4/Makefile | 6 +- dyninstAPI_RT/ia64-unknown-linux2.4/Makefile | 4 +- make.config | 318 +++++++++++++-------------- nmake.config | 82 +++++-- paradynd/i386-unknown-linux2.4/Makefile | 13 +- paradynd/ia64-unknown-linux2.4/Makefile | 6 +- 10 files changed, 259 insertions(+), 206 deletions(-) diff --git a/dyner/i386-unknown-linux2.4/Makefile b/dyner/i386-unknown-linux2.4/Makefile index eba48ec..fec4236 100644 --- a/dyner/i386-unknown-linux2.4/Makefile +++ b/dyner/i386-unknown-linux2.4/Makefile @@ -20,7 +20,7 @@ include $(TO_CORE)/make.config #CFLAGS += -g -DUSES_DYNAMIC_INF_HEAP SYSLIBS += -lnsl -LIBS = -L$(LIBDWARFDIR)/lib -ldwarf +LIBS = -L$(LIBDWARF_LIB) -ldwarf MUTATEE_CFLAGS += -rdynamic -ldl diff --git a/dyner/make.module.tmpl b/dyner/make.module.tmpl index 4a9b1cc..6a6b0a4 100644 --- a/dyner/make.module.tmpl +++ b/dyner/make.module.tmpl @@ -3,7 +3,7 @@ # be a useful Makefile in isolation; instead, it should be included # from within an architecture-specific Makefile. # -# $Id: make.module.tmpl,v 1.20 2004/04/28 20:20:04 rchen Exp $ +# $Id: make.module.tmpl,v 1.21 2004/06/24 22:27:41 legendre Exp $ # SUITE_NAME = Dyninst @@ -33,7 +33,7 @@ endif LIBS += -ldyninstAPI -SYSLIBS += -liberty -L$(TCLTK_DIR) $(TCL_LIB) +SYSLIBS += -liberty -L$(TCLTK_LIB_DIR) $(TCL_LIB) all: $(TARGET) $(TEST_TARGET) diff --git a/dyninstAPI/i386-unknown-linux2.4/Makefile b/dyninstAPI/i386-unknown-linux2.4/Makefile index 7cd61c4..4a09841 100644 --- a/dyninstAPI/i386-unknown-linux2.4/Makefile +++ b/dyninstAPI/i386-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.22 2004/05/12 22:37:45 legendre Exp $ +# $Id: Makefile,v 1.23 2004/06/24 22:27:43 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -56,8 +56,8 @@ SRCS = ../src/linux.C \ #MYFLAGS += -DSIGNAL_DEBUG #MYFLAGS += -DASTDEBUG #MYFLAGS += -DINFERIOR_RPC_DEBUG -MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARFDIR) -MYFLAGS += -I$(LIBELFDIR)/include +MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARF_INC) +MYFLAGS += -I$(LIBELF_INC) MYFLAGS += -I/usr/include/libelf CXXFLAGS += $(MYFLAGS) @@ -69,7 +69,12 @@ TFLAGS += $(MYFLAGS) SYSLIBS = -ldl -LIBS += -L$(LIBDWARFDIR)/lib -ldwarf -L$(LIBELFDIR)/bin +LIBS += -L$(LIBDWARF_LIB) -L$(LIBELF_LIB) +ifdef LIBDWARFSTATIC +LIBS += -Wl,-static -ldwarf -Wl,-call_shared +else +LIBS += -ldwarf +endif ifdef LIBELFSTATIC LIBS += -Wl,-static -lelf -Wl,-call_shared else diff --git a/dyninstAPI/ia64-unknown-linux2.4/Makefile b/dyninstAPI/ia64-unknown-linux2.4/Makefile index 4f062f7..3da7b6a 100644 --- a/dyninstAPI/ia64-unknown-linux2.4/Makefile +++ b/dyninstAPI/ia64-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.17 2004/05/12 22:37:46 legendre Exp $ +# $Id: Makefile,v 1.18 2004/06/24 22:27:44 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -42,8 +42,8 @@ SRCS = ../src/linux.C \ ../src/ia64-template.s \ ../src/syscall-linux.C -MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARFDIR) \ - -I$(LIBUNWINDDIR)/include -I$(LIBELFDIR)/include \ +MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARF_INC) \ + -I$(LIBUNWIND_INC) -I$(LIBELF_INC) \ -I/usr/include/libelf CXXFLAGS += $(MYFLAGS) @@ -55,13 +55,18 @@ TFLAGS += $(MYFLAGS) SYSLIBS = -ldl -LIBS = -L$(LIBDWARFDIR)/lib -ldwarf -L$(LIBELFDIR)/bin +LIBS = -L$(LIBDWARF_LIB) -L$(LIBELF_LIB) +ifdef LIBDWARFSTATIC +LIBS += -Wl,-Bstatic -ldwarf -Wl,-Bdynamic +else +LIBS += -ldwarf +endif ifdef LIBELFSTATIC -LIBS += -Wl,-static -lelf -Wl,-call_shared +LIBS += -Wl,-Bstatic -lelf -Wl,-Bdynamic else LIBS += -lelf endif -LIBS += -L$(LIBUNWINDDIR)/lib -Wl,-Bstatic -lunwind -Wl,-Bdynamic +LIBS += -L$(LIBUNWIND_LIB) -Wl,-Bstatic -lunwind -Wl,-Bdynamic AS = /usr/bin/as diff --git a/dyninstAPI_RT/i386-unknown-linux2.4/Makefile b/dyninstAPI_RT/i386-unknown-linux2.4/Makefile index cbabb98..188c667 100644 --- a/dyninstAPI_RT/i386-unknown-linux2.4/Makefile +++ b/dyninstAPI_RT/i386-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.14 2004/05/12 22:37:47 legendre Exp $ +# $Id: Makefile,v 1.15 2004/06/24 22:27:45 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -25,9 +25,9 @@ CFLAGS += -O2 # if we want to produce a shared object... CC = $(GCC) LD = $(GCC) -CFLAGS += -I. -I../.. -I$(LIBELFDIR)/include -I/usr/include/libelf -fpic +CFLAGS += -I. -I../.. -I$(LIBELF_INC) -I/usr/include/libelf -fpic -LIBS += -ldl -L$(LIBELFDIR)/bin +LIBS += -ldl -L$(LIBELF_LIB) ifdef LIBELFSTATIC LIBS += -Wl,-static -lelf -Wl,-call_shared else diff --git a/dyninstAPI_RT/ia64-unknown-linux2.4/Makefile b/dyninstAPI_RT/ia64-unknown-linux2.4/Makefile index cca671a..3f3f99b 100644 --- a/dyninstAPI_RT/ia64-unknown-linux2.4/Makefile +++ b/dyninstAPI_RT/ia64-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.8 2004/05/25 17:13:30 tlmiller Exp $ +# $Id: Makefile,v 1.9 2004/06/24 22:27:46 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -18,7 +18,7 @@ CC = $(GCC) LD = $(GCC) CFLAGS += -I. -I../.. -fpic LDFLAGS += -shared -ldl -Wl,-init,_start \ - -L$(LIBUNWINDDIR)/lib \ + -L$(LIBUNWIND_LIB) \ -Wl,--whole-archive -Wl,-Bstatic -lunwind -Wl,-Bdynamic -Wl,--no-whole-archive ASFLAGS = diff --git a/make.config b/make.config index 687c05a..94a790b 100644 --- a/make.config +++ b/make.config @@ -1,10 +1,11 @@ # Paradyn overall build configuration (unix) # -# $Id: make.config,v 1.169 2004/05/17 00:46:10 pcroth Exp $ +# $Id: make.config,v 1.170 2004/06/24 22:27:39 legendre Exp $ # SUITE_NAME = Paradyn RELEASE_NUM = 4.1 + #BUILD_MARK = EXPLICIT_DEPENDS = 1 #USE_STL_VECTOR = 1 @@ -37,20 +38,20 @@ PROGRAM_DEST = ../${PLATFORM}/bin # is about. It's used several times below in this file. BACKUP_CORE = /p/paradyn/core -GCC = gcc -GXX = g++ -LINKER = ld -AS = /bin/as -CC = $(GCC) -CXX = $(GXX) -LEX = flex -RANLIB = ranlib -AR = ar -YFLAGS = -d -y -YACC = bison -MV = mv -CP = cp -RM = rm -f +GCC = gcc +GXX = g++ +LINKER = ld +AS = as +CC = $(GCC) +CXX = $(GXX) +LEX = flex +RANLIB = ranlib +AR = ar +YFLAGS = -d -y +YACC = bison +MV = mv +CP = cp +RM = rm -f MKDIR = mkdir -p PERL = perl # NB: perl v5 or higher required! @@ -59,9 +60,7 @@ COLLECTOR = /s/gcc-2.7.2/bin/../lib/gcc-lib/$(PLATFORM)/2.7.2/ld # BUILDSTAMP is used to generate local build vouchers BUILDSTAMP = $(TO_CORE)/../scripts/buildstamp -ifdef PLATFORM -UNIFIED_DEF = -D$(shell echo $$PLATFORM | $(PERL) -pe 's/\./_/g;s/-/_/g') -else +ifndef PLATFORM BUILDERROR: PLATFORM must be defined in environment to build (and run) Paradyn endif @@ -69,60 +68,60 @@ endif # is added, add it to the list ifeq ($(PLATFORM),alpha-dec-osf5.1) -OLD_DEF = -Dalpha_dec_osf4_0 -ARCH_DEF = -Darch_alpha -OS_DEF = -Dos_osf=51 -CAP_DEF = -Dcap_proc -Dcap_proc_ioctl -BUG_DEF = +OLD_DEF = -Dalpha_dec_osf4_0 +ARCH_DEF = -Darch_alpha +OS_DEF = -Dos_osf=51 +CAP_DEF = -Dcap_proc -Dcap_proc_ioctl +BUG_DEF = endif ifeq ($(PLATFORM),mips-sgi-irix6.5) -OLD_DEF = -Dmips_sgi_irix6_4 -ARCH_DEF = -Darch_mips -OS_DEF = -Dos_irix=65 -CAP_DEF = -Dcap_proc -Dcap_proc_ioctl -BUG_DEF = -Dbug_irix_broken_sigstop +OLD_DEF = -Dmips_sgi_irix6_4 +ARCH_DEF = -Darch_mips +OS_DEF = -Dos_irix=65 +CAP_DEF = -Dcap_proc -Dcap_proc_ioctl +BUG_DEF = -Dbug_irix_broken_sigstop endif ifeq ($(PLATFORM),i386-unknown-linux2.4) -OLD_DEF = -Di386_unknown_linux2_0 -ARCH_DEF = -Darch_x86 -OS_DEF = -Dos_linux=24 -CAP_DEF = -Dcap_ptrace -Dcap_save_the_world -BUG_DEF = +OLD_DEF = -Di386_unknown_linux2_0 +ARCH_DEF = -Darch_x86 +OS_DEF = -Dos_linux=24 +CAP_DEF = -Dcap_ptrace -Dcap_save_the_world +BUG_DEF = endif ifeq ($(PLATFORM),i386-unknown-linux2.6) -OLD_DEF = -Di386_unknown_linux2_0 -ARCH_DEF = -Darch_x86 -OS_DEF = -Dos_linux=26 -CAP_DEF = -Dcap_ptrace -Dcap_save_the_world -BUG_DEF = +OLD_DEF = -Di386_unknown_linux2_0 +ARCH_DEF = -Darch_x86 +OS_DEF = -Dos_linux=26 +CAP_DEF = -Dcap_ptrace -Dcap_save_the_world +BUG_DEF = endif ifeq ($(PLATFORM),ia64-unknown-linux2.4) -OLD_DEF = -Dia64_unknown_linux2_4 -ARCH_DEF = -Darch_ia64 -OS_DEF = -Dos_linux=24 -CAP_DEF = -Dcap_ptrace -BUG_DEF = +OLD_DEF = -Dia64_unknown_linux2_4 +ARCH_DEF = -Darch_ia64 +OS_DEF = -Dos_linux=24 +CAP_DEF = -Dcap_ptrace +BUG_DEF = endif ifeq ($(PLATFORM),sparc-sun-solaris2.8) -OLD_DEF = -Dsparc_sun_solaris2_4 -ARCH_DEF = -Darch_sparc -OS_DEF = -Dos_solaris=8 -CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world -BUG_DEF = +OLD_DEF = -Dsparc_sun_solaris2_4 +ARCH_DEF = -Darch_sparc +OS_DEF = -Dos_solaris=8 +CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world +BUG_DEF = endif ifeq ($(PLATFORM),sparc-sun-solaris2.9) -OLD_DEF = -Dsparc_sun_solaris2_4 -ARCH_DEF = -Darch_sparc -OS_DEF = -Dos_solaris=9 -CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world -BUG_DEF = +OLD_DEF = -Dsparc_sun_solaris2_4 +ARCH_DEF = -Darch_sparc +OS_DEF = -Dos_solaris=9 +CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world +BUG_DEF = endif ifeq ($(PLATFORM),rs6000-ibm-aix5.1) -OLD_DEF = -Drs6000_ibm_aix5_1 -Drs6000_ibm_aix4_1 -ARCH_DEF = -Darch_power -OS_DEF = -Dos_aix=51 -CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world -BUG_DEF = -Dbug_aix_proc_broken_fork +OLD_DEF = -Drs6000_ibm_aix5_1 -Drs6000_ibm_aix4_1 +ARCH_DEF = -Darch_power +OS_DEF = -Dos_aix=51 +CAP_DEF = -Dcap_proc -Dcap_proc_fd -Dcap_save_the_world +BUG_DEF = -Dbug_aix_proc_broken_fork endif # @@ -137,15 +136,14 @@ endif ifeq (linux,$(findstring linux,$(OS_DEF))) AS = /usr/bin/as - -ifndef NASM -NASM = nasm -endif RANLIB = true - -# os-linux endif +ifeq (ia64,$(findstring ia64,$(ARCH_DEF))) +ASFLAGS = +else +ASFLAGS = -P $(UNIFIED_DEF) +endif # set the macros that control whether the stdint limit and constant # macros are defined for C++ on the compilers command line so that @@ -172,12 +170,6 @@ DEPCXXFLAGS = -MM $(CXXFLAGS) IFLAGS = $(FIRST_INCLUDE) -I. -I$(TO_CORE) -I${TO_CORE}/../${PLATFORM}/include -ifeq (ia64,$(findstring ia64,$(ARCH_DEF))) -ASFLAGS = -else -ASFLAGS = -P $(UNIFIED_DEF) -endif - # uncomment/comment the line below to build with/without compilation warnings # SILENCE_WARNINGS=true @@ -460,62 +452,102 @@ KFLAGS += -fexternal-templates -Dexternal_templates endif endif -# ***** EXTERNAL SOFTWARE CONFIGURATION ***** +THREADSLIB = +USE_PTHREADS = yes -ifdef USES_UNWIND_LIB -ifndef LIBUNWINDDIR -LIBUNWINDDIR = /p/paradyn/packages/libunwind +ifeq (xyes,x$(USE_PTHREADS)) +THREADSLIB += -lpthread + +# On Linux, programs using pthreads are supposed to define _REENTRANT +ifeq (linux,$(findstring linux,$(PLATFORM))) +CFLAGS += -D_REENTRANT=1 +CXXFLAGS += -D_REENTRANT=1 +KFLAGS += -D_REENTRANT=1 +TFLAGS += -D_REENTRANT=1 endif + +ifeq (rs6000,$(findstring rs6000,$(PLATFORM))) +#CFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +#CXXFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +#KFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +#TFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 endif -ifdef USES_DWARF_DEBUG -ifndef LIBDWARFDIR -LIBDWARFDIR = /p/paradyn/packages/libdwarf +ifeq (solaris,$(findstring linux,$(PLATFORM))) +CFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +CXXFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +KFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 +TFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 endif -#LIBDWARFDIR = $(HOME)/src/dwarf/libdwarf + endif -ifdef USES_LIBELF -ifndef LIBELFDIR -LIBELFDIR = /p/paradyn/packages/libelf -#LIBELFSTATIC = true +# System build constraints +#Build the MT daemon on AIX, Solaris, and Linux/x86 +DONT_BUILD_PD_MT = true +ifeq (rs6000-ibm-aix,$(findstring rs6000-ibm-aix,$(PLATFORM))) +DONT_BUILD_PD_MT = +endif +ifeq (sparc-sun-solaris,$(findstring sparc-sun-solaris,$(PLATFORM))) +DONT_BUILD_PD_MT = +endif +ifeq (i386-unknown-linux2.4,$(findstring i386-unknown-linux2.4,$(PLATFORM))) +DONT_BUILD_PD_MT = +endif + +# ***** EXTERNAL SOFTWARE CONFIGURATION ***** + +# Include any per-user configuration changes; this "local" config file +# should *not* be under CVS control, so that it never gets committed. +-include $(TO_CORE)/make.config.local + +# Choose default development directories if necessary variables are unset + +ifdef USES_TCLTK +ifdef USE_TCL83 +TCLTK_DIR ?= /p/paradyn/packages/tcl8.3.4 +else +TCLTK_DIR ?= /p/paradyn/packages/tcl8.4.5 endif +TCLTK_LIB_DIR ?= $(TCLTK_DIR)/lib +TCLTK_INC_DIR ?= $(TCLTK_DIR)/include endif -ifdef USES_LIBHRTIME -HRTIME_ROOT = /p/paradyn/packages/libhrtime-0.6 -HRTIME_INCDIR = $(HRTIME_ROOT)/include -HRTIME_LIBDIR = $(HRTIME_ROOT)/lib -HRTIME_LIB = -Wl,-static -lhrtime -Wl,-Bdynamic -IFLAGS += -I$(HRTIME_INCDIR) -LIBDIR += $(patsubst %,-L%,$(HRTIME_LIBDIR)) -CFLAGS += -DHRTIME -CXXFLAGS += -DHRTIME -TFLAGS += -DHRTIME +ifdef USES_UNWIND_LIB +LIBUNWINDDIR ?= /p/paradyn/packages/libunwind +LIBUNWIND_LIB ?= $(LIBUNWINDDIR)/lib +LIBUNWIND_INC ?= $(LIBUNWINDDIR)/include +endif + +ifdef USES_DWARF_DEBUG +LIBDWARFDIR ?= /p/paradyn/packages/libdwarf +LIBDWARF_INC ?= $(LIBDWARFDIR)/include +LIBDWARF_LIB ?= $(LIBDWARFDIR)/lib +endif + +ifdef USES_LIBELF +LIBELFDIR ?= /p/paradyn/packages/libelf +LIBELF_INC ?= $(LIBELFDIR)/include +LIBELF_LIB ?= $(LIBELFDIR)/lib endif ifdef USES_PAPI -PAPI_ROOT = /p/paradyn/packages/papi-3.0.0-test -PAPI_INCDIR = $(PAPI_ROOT) -PAPI_LIBDIR = $(PAPI_ROOT) -#PAPI_LIB = -Wl,-static -lpapi -Wl,-Bdynamic -#PAPI_LIB = $(PAPI_LIBDIR)/libpapi.a -PAPI_LIB = -Wl,-rpath=$(PAPI_LIBDIR) -L$(PAPI_LIBDIR) -lpapi -IFLAGS += -I$(PAPI_INCDIR) -LIBDIR += $(patsubst %,-L%,$(PAPI_LIBDIR)) -CFLAGS += -DPAPI -CXXFLAGS += -DPAPI -TFLAGS += -DPAPI +PAPI_ROOT ?= /p/paradyn/packages/papi-3.0.0-test +endif + +ifdef USES_FLEX +FLEX_DIR ?= /s/flex/lib endif -ifdef USES_TCLTK +NASM ?= /p/paradyn/packages/nasm/bin/nasm +#Build other variables based off of the above defaults + +ifdef USES_TCLTK # use the first set if using tcl8.4, # use the second set if still using tcl8.3 ifndef USE_TCL83 -TCLTK_DIR = /p/paradyn/packages/tcl8.4.5 -#TCLTK_DIR = /opt/freeware/lib TCLTK_LIBVER_ID = 8.4 CFLAGS += -DTCLCONST=const CXXFLAGS += -DTCLCONST=const @@ -524,8 +556,6 @@ TFLAGS += -DTCLCONST=const else -TCLTK_DIR = /p/paradyn/packages/tcl8.3.4 -#TCLTK_DIR = /opt/freeware/lib TCLTK_LIBVER_ID = 8.3 CFLAGS += -DTCLCONST="" CXXFLAGS += -DTCLCONST="" @@ -534,28 +564,43 @@ TFLAGS += -DTCLCONST="" endif -TCLTK_INCLUDES = $(TCLTK_DIR)/include TCL_LIB = -ltcl$(TCLTK_LIBVER_ID) TK_LIB = -ltk$(TCLTK_LIBVER_ID) + +ifdef LIBTCLTKSTATIC +TCLTK_LIBS += -Wl,-Bstatic $(TCL_LIB) $(TK_LIB) -Wl,-Bdynamic +else TCLTK_LIBS += $(TCL_LIB) $(TK_LIB) +endif # TCL2C is used to generate compilable sources from tcl files TCL2C = $(TO_CORE)/../scripts/tcl2c TCL2C_GEN_SRCS = tcl2c.C -IFLAGS += $(patsubst %,-I%,$(TCLTK_INCLUDES)) +IFLAGS += -I$(TCLTK_INC_DIR) ifdef CROSSCOMPILER LIBDIR += $(patsubst %,-L%/rs_aix41/lib,$(TCLTK_DIR)) else -LIBDIR += $(patsubst %,-L%/lib,$(TCLTK_DIR)) +LIBDIR += $(patsubst %,-L%,$(TCLTK_LIB_DIR)) endif endif # USES_TCLTK +ifdef USES_PAPI +PAPI_INCDIR = $(PAPI_ROOT) +PAPI_LIBDIR = $(PAPI_ROOT) +#PAPI_LIB = -Wl,-static -lpapi -Wl,-Bdynamic +#PAPI_LIB = $(PAPI_LIBDIR)/libpapi.a +PAPI_LIB = -Wl,-rpath=$(PAPI_LIBDIR) -L$(PAPI_LIBDIR) -lpapi +IFLAGS += -I$(PAPI_INCDIR) +LIBDIR += $(patsubst %,-L%,$(PAPI_LIBDIR)) +CFLAGS += -DPAPI +CXXFLAGS += -DPAPI +TFLAGS += -DPAPI +endif + ifdef USES_FLEX FLEX_LIB = -lfl -#FLEX_DIR=/usr/lib -FLEX_DIR = /s/flex/lib LIBDIR += $(patsubst %,-L%,$(FLEX_DIR)) VPATH += $(FLEX_DIR) endif @@ -595,50 +640,3 @@ endif endif # USES_X11 -THREADSLIB = -USE_PTHREADS = yes - -ifeq (xyes,x$(USE_PTHREADS)) -THREADSLIB += -lpthread - -# On Linux, programs using pthreads are supposed to define _REENTRANT -ifeq (linux,$(findstring linux,$(PLATFORM))) -CFLAGS += -D_REENTRANT=1 -CXXFLAGS += -D_REENTRANT=1 -KFLAGS += -D_REENTRANT=1 -TFLAGS += -D_REENTRANT=1 -endif - -ifeq (rs6000,$(findstring rs6000,$(PLATFORM))) -#CFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -#CXXFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -#KFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -#TFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -endif - -ifeq (solaris,$(findstring linux,$(PLATFORM))) -CFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -CXXFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -KFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -TFLAGS += -D_REENTRANT=1 -D_THREAD_SAFE=1 -D_THREAD_SAFE_ERRNO=1 -endif - -endif - -# System build constraints -#Build the MT daemon on AIX, Solaris, and Linux/x86 -DONT_BUILD_PD_MT = true -ifeq (rs6000-ibm-aix,$(findstring rs6000-ibm-aix,$(PLATFORM))) -DONT_BUILD_PD_MT = -endif -ifeq (sparc-sun-solaris,$(findstring sparc-sun-solaris,$(PLATFORM))) -DONT_BUILD_PD_MT = -endif -ifeq (i386-unknown-linux2.4,$(findstring i386-unknown-linux2.4,$(PLATFORM))) -DONT_BUILD_PD_MT = -endif - -# Include any per-user configuration changes; this "local" config file -# should *not* be under CVS control, so that it never gets committed. - --include $(TO_CORE)/make.config.local diff --git a/nmake.config b/nmake.config index 7e9db6b..da359b3 100644 --- a/nmake.config +++ b/nmake.config @@ -1,6 +1,6 @@ # Paradyn overall build configuration (Windows/NT) # -# $Id: nmake.config,v 1.64 2004/05/14 16:49:11 legendre Exp $ +# $Id: nmake.config,v 1.65 2004/06/24 22:27:40 legendre Exp $ # USE_VC6 = true @@ -48,8 +48,6 @@ CC = cl -nologo CXX = cl -nologo LINK = link RANLIB = -RPCPKG = p:\paradyn\packages\winnt\oncrpc -#RPCPKG = f:\oncrpc RPC_LIB = oncrpc.lib #X11DIR = YACC = bison @@ -58,12 +56,6 @@ LDFLAGS = -nologo PERL = perl # NB: perl v5 or higher required! -!ifdef USES_FLEX -LEX = flex -FLEX_LIB = libfl.a -LDFLAGS = $(LDFLAGS) -LIBPATH:c:\cygwin\lib -!endif - !ifdef SHELL # use richer Unix shell utilities when they're available! CP = cp MV = mv @@ -97,7 +89,7 @@ MODCFLAGS = $(CXXFLAGS) VPATH = ..\src:$(TO_CORE)\$(LIBRARY_DEST):$(TO_CORE)\..\lib\$(PLATFORM):$(BACKUP_CORE)\..\lib\$(PLATFORM) -IFLAGS = -I. -I$(TO_CORE) -I$(RPCPKG) -I$(TO_CORE)\..\$(PLATFORM)\include +IFLAGS = -I. -I$(TO_CORE) -I$(TO_CORE)\..\$(PLATFORM)\include #ASFLAGS = -P $(UNIFIED_DEF) @@ -145,7 +137,7 @@ LIBDIR = -LIBPATH:$(TO_CORE)\$(LIBRARY_DEST) \ -LIBPATH:$(TO_CORE)\..\lib\$(PLATFORM) \ -LIBPATH:$(BACKUP_CORE)\..\$(PLATFORM)\lib \ -LIBPATH:$(BACKUP_CORE)\..\lib\$(PLATFORM) \ - -LIBPATH:$(RPCPKG)\lib + -LIBPATH:$(RPCPKG_LIB) #USE OLD LINE INFORMATION FOR THE TIME BEING CFLAGS = $(CFLAGS) -DOLD_LINE_INFO @@ -176,6 +168,55 @@ IGEN = $(TO_CORE)\igen\$(PLATFORM) !endif !endif +# Include any per-user configuration changes; this "local" config file +# should *not* be under CVS control, so that it never gets committed. + +!if exist ($(TO_CORE)\nmake.config.local) +!include $(TO_CORE)\nmake.config.local +!endif + +# Set variables to default values if they weren't set in +# nmake.config.local + +!ifdef USES_TCLTK + +!ifndef TCLTK_DIR +!ifdef USE_TCL83 +TCLTK_DIR = p:\paradyn\packages\tcl8.3.4 +!else +TCLTK_DIR = p:\paradyn\packages\tcl8.4.5 +!endif +!endif + +!ifndef TCLTK_LIB_DIR +TCLTK_LIB_DIR = $(TCLTK_DIR)\lib +!endif + +!ifndef TCLTK_INC_DIR +TCLTK_INC_DIR = $(TCLTK_DIR)\include +!endif +!endif + +!ifdef USES_FLEX +!ifndef FLEX_DIR +FLEX_DIR = c:\cygwin\lib +!endif +!endif + +!ifndef RPCPKG +RPCPKG = p:\paradyn\packages\winnt\oncrpc +!endif +!ifndef RPCPKG_INC +RPCPKG_INC = $(RPCPKG) +!endif +!ifndef RPCPKG_LIB +RPCPKG_LIB = $(RPCPKG)\lib +!endif + +!ifndef NASM +NASM = P:\paradyn\packages\nasm\bin\nasmw +!endif + # ***** EXTERNAL SOFTWARE CONFIGURATION ***** !ifdef USES_TCLTK @@ -192,7 +233,6 @@ TCL2C_GEN_SRCS = tcl2c.C # Specify the Tcl/Tk files to be used !ifndef USE_TCL83 -TCLTK_DIR = p:\paradyn\packages\tcl8.4.5 TCLTK_LIBVER_ID = 84t CFLAGS = $(CFLAGS) -DTCLCONST="const" CXXFLAGS = $(CXXFLAGS) -DTCLCONST="const" @@ -201,7 +241,6 @@ KFLAGS = $(KFLAGS) -DTCLCONST="const" !else -TCLTK_DIR = p:\paradyn\packages\tcl8.3.4 TCLTK_LIBVER_ID = 83 CFLAGS = $(CFLAGS) -DTCLCONST="" CXXFLAGS = $(CXXFLAGS) -DTCLCONST="" @@ -210,8 +249,8 @@ KFLAGS = $(KFLAGS) -DTCLCONST="" !endif -TCLTK_INCLUDES = -I$(TCLTK_DIR)\include -TCLTK_LIBPATH = -LIBPATH:$(TCLTK_DIR)\lib +TCLTK_INCLUDES = -I$(TCLTK_INC_DIR) +TCLTK_LIBPATH = -LIBPATH:$(TCLTK_LIB_DIR) TCL_LIB = tcl$(TCLTK_LIBVER_ID).lib TK_LIB = tk$(TCLTK_LIBVER_ID).lib TCLTK_LIBS = $(TCL_LIB) $(TK_LIB) @@ -220,10 +259,11 @@ IFLAGS = $(IFLAGS) $(TCLTK_INCLUDES) LIBDIR = $(LIBDIR) $(TCLTK_LIBPATH) !endif /* USES_TCLTK */ - -# Include any per-user configuration changes; this "local" config file -# should *not* be under CVS control, so that it never gets committed. - -!if exist ($(TO_CORE)\nmake.config.local) -!include $(TO_CORE)\nmake.config.local +!ifdef USES_FLEX +LEX = flex +FLEX_LIB = libfl.a +LDFLAGS = $(LDFLAGS) -LIBPATH:$(FLEX_DIR) !endif + +IFLAGS = $(IFLAGS) -I$(RPCPKG_INC) +LIBDIR = $(LIBDIR) -LIBPATH:$(RPCPKG_LIB) \ No newline at end of file diff --git a/paradynd/i386-unknown-linux2.4/Makefile b/paradynd/i386-unknown-linux2.4/Makefile index acec23a..9f873a0 100644 --- a/paradynd/i386-unknown-linux2.4/Makefile +++ b/paradynd/i386-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.22 2004/05/12 22:37:48 legendre Exp $ +# $Id: Makefile,v 1.23 2004/06/24 22:27:47 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -56,12 +56,17 @@ SRCS = ../../dyninstAPI/src/linux.C \ ../../dyninstAPI/src/syscall-linux.C MYFLAGS += -DNO_MDL_PRINT -MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARFDIR) -MYFLAGS += -I$(LIBELFDIR)/include +MYFLAGS += -DUSES_DWARF_DEBUG -I$(LIBDWARF_INC) +MYFLAGS += -I$(LIBELF_INC) MYFLAGS += -I/usr/include/libelf SYSLIBS = -ldl -LIBS = -L$(LIBDWARFDIR)/lib -ldwarf -L$(LIBELFDIR)/bin +LIBS = -L$(LIBDWARF_LIB) -L$(LIBELF_LIB) +ifdef LIBDWARFSTATIC +LIBS += -Wl,-static -ldwarf -Wl,-call_shared +else +LIBS += -ldwarf +endif ifdef LIBELFSTATIC LIBS += -Wl,-static -lelf -Wl,-call_shared else diff --git a/paradynd/ia64-unknown-linux2.4/Makefile b/paradynd/ia64-unknown-linux2.4/Makefile index 8aef22a..73e438e 100644 --- a/paradynd/ia64-unknown-linux2.4/Makefile +++ b/paradynd/ia64-unknown-linux2.4/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 2004/05/12 22:37:49 legendre Exp $ +# $Id: Makefile,v 1.5 2004/06/24 22:27:48 legendre Exp $ # # Define any symbols needed to invoke configuration changes in make.config @@ -43,11 +43,11 @@ SRCS = ../../dyninstAPI/src/linux.C \ ../../dyninstAPI/src/unix.C \ ../../rtinst/src/RThwtimer-linux.c -MYFLAGS += -I$(LIBELFDIR)/include -I/usr/include/libelf +MYFLAGS += -I$(LIBELF_INC) -I/usr/include/libelf MYFLAGS += -DNO_MDL_PRINT SYSLIBS = -ldl -LIBS = -L$(LIBELFDIR)/bin +LIBS = -L$(LIBELF_LIB) ifdef LIBELFSTATIC LIBS += -Wl,-static -lelf -Wl,-call_shared else -- 1.8.3.1