From 4bc594843b4042ced15dcd18df5810187e14053f Mon Sep 17 00:00:00 2001 From: erickson Date: Sun, 19 Jun 2005 18:07:34 +0000 Subject: [PATCH] moved apache header dir to the toplevel makefile git-svn-id: svn://svn.open-ils.org/ILS/trunk@868 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/Makefile | 31 ++++++++++++++++--------------- OpenSRF/src/gateway/Makefile | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/OpenSRF/src/Makefile b/OpenSRF/src/Makefile index ffcf195071..ce532e2bfd 100644 --- a/OpenSRF/src/Makefile +++ b/OpenSRF/src/Makefile @@ -3,21 +3,22 @@ # # Change to suit... -export PREFIX = /pines -export APXS = /pines/apps/apache2/bin/apxs -export TMP = /tmp/opensrf_build - - -export TMPDIR = $(TMP)/opensrf -export OPENSRF = opensrf -export BINDIR = $(PREFIX)/bin -export LIBDIR = $(PREFIX)/lib -export PERLDIR = $(LIBDIR)/perl5 -export INCLUDEDIR = $(PREFIX)/include -export CC = gcc -export LD_OPTS = -L $(TMPDIR) -L . -export CC_OPTS = -Wall -O2 -fPIC -I /usr/include/libxml2 \ - -I /usr/include/libxml2/libxml -I $(TMP) -I $(TMPDIR) +export PREFIX = /pines +export APXS = /pines/apps/apache2/bin/apxs +export TMP = /tmp/opensrf_build +export APACHE_HEADERS = /pines/apps/apache2/include + + +export TMPDIR = $(TMP)/opensrf +export OPENSRF = opensrf +export BINDIR = $(PREFIX)/bin +export LIBDIR = $(PREFIX)/lib +export PERLDIR = $(LIBDIR)/perl5 +export INCLUDEDIR = $(PREFIX)/include +export CC = gcc +export LD_OPTS = -L $(TMPDIR) -L . +export CC_OPTS = -Wall -O2 -fPIC -I/usr/include/libxml2 -I$(APACHE_HEADERS) \ + -I/usr/include/libxml2/libxml -I$(TMP) -I$(TMPDIR) all: prep router srfsh jserver gateway diff --git a/OpenSRF/src/gateway/Makefile b/OpenSRF/src/gateway/Makefile index b688938859..1a2ccf3e95 100644 --- a/OpenSRF/src/gateway/Makefile +++ b/OpenSRF/src/gateway/Makefile @@ -1,4 +1,4 @@ -CC_OPTS += -I /pines/apps/apache2/include -DASSUME_STATELESS +CC_OPTS += -DASSUME_STATELESS LD_OPTS += -lc_utils -lobjson -lxml2 -lopensrf_transport -lopensrf_stack -ljson all: libmod_ils_gateway.so -- 2.11.0