diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile index 9e3bff2..54deb81 100644 --- a/AusRegCliever/Makefile +++ b/AusRegCliever/Makefile @@ -1,5 +1,6 @@ LOCATION=authoring # +# # Add other locations and move target differences into the macros as needed # CC=g++ @@ -12,34 +13,22 @@ Cc=gcc ifeq ($(LOCATION),authoring) ARTKLIB=-L/home/jdaugherty/clients/reg.de/git/AusRegEPPTK/lib ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/AusRegEPPTK/common - #ARTKLIB=-L/home/jdaugherty/clients/reg.de/git/ACTK1_3_2/lib - #ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_3_2/common -endif - -ifeq ($(LOCATION),testing) - ARTKLIB=-L/home/drde/git/AusRegEPPTK/lib - ARTKINCL=I/home/drde/git/AusRegEPPTK/common +else + ARTKLIB=-L/home/jdaugherty/dnseppus/AusRegEPPTK/lib + ARTKINCL=-I/home/jdaugherty/dnseppus/AusRegEPPTK/common endif SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) $(ARTKLIB) -l boost_system -l boost_thread -l log4cpp -l AusRegEPPTK -ifeq ($(LOCATION),authoring) SINCL= -I include -I /usr/include/log4cpp $(BOSINCL) CFLAGS= -DCURRENT_DEBUG=1000 -ggdb3 -endif - -ifeq ($(LOCATION),production) -SINCL= -I include -I /usr/include/log4cpp $(BOSINCL) -CFLAGS= -DPRODUCTION=1 -endif - ifeq ($(LOCATION),authoring) XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ -endif -ifeq ($(LOCATION),production) +else XALAN_LIB_DIR = /usr/lib/ endif + XALAN_LIB = xalan-c XALAN_INC_DIR = /usr/include/xalanc XERCES_LIB_DIR = /usr/lib/ diff --git a/AusRegEPPTK/Makefile b/AusRegEPPTK/Makefile index 6ff8385..a774ead 100644 --- a/AusRegEPPTK/Makefile +++ b/AusRegEPPTK/Makefile @@ -1,7 +1,8 @@ ################################################## # Makefile for building lib and main test routine# ################################################## -# operating system +LOCATION=authoring + SYSTEM = $(shell uname -s) CXX = g++ @@ -14,7 +15,12 @@ CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC CPPFLAGS = -fPIC -D_GNU_SOURCE CXXFLAGS += -D_GNU_SOURCE -O0 +ifeq ($(LOCATION),authoring) XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ +endif +ifeq ($(LOCATION),production) +XALAN_LIB_DIR = /usr/lib/ +endif XALAN_LIB = xalan-c XALAN_INC_DIR = /usr/include/xalanc XERCES_LIB_DIR = /usr/lib/