From bdac2964466f8bb70392bdb11561f203f6dd6a64 Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 31 Jan 2008 20:13:05 +0000 Subject: [PATCH] put source include files in front of installed, system include files in the -I list (avoids mis-matched definition errors when const, etc is corrected) git-svn-id: svn://svn.open-ils.org/ILS/trunk@8554 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/Makefile | 2 +- Open-ILS/src/c-apps/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile index 07643383fe..ac95add561 100644 --- a/Open-ILS/src/Makefile +++ b/Open-ILS/src/Makefile @@ -1,7 +1,7 @@ # vim:noet:ts=4 export LDFLAGS += -L . -L$(TMP) -L $(OPENSRF_LIBS) -export CFLAGS += -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \ +export CFLAGS += -pipe -g -Wall -O2 -fPIC -I../../include -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \ -D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS) export INCDIR = "$(INCLUDEDIR)/openils/" diff --git a/Open-ILS/src/c-apps/Makefile b/Open-ILS/src/c-apps/Makefile index 0ac65fca4b..645579e8da 100644 --- a/Open-ILS/src/c-apps/Makefile +++ b/Open-ILS/src/c-apps/Makefile @@ -1,6 +1,6 @@ LDLIBS += -lobjson -lopensrf #-lfieldmapper LDFLAGS += -Wl,-rpath=$(LIBDIR) -L$(DBI_LIBS) -CFLAGS += -DOSRF_LOG_PARAMS -I../../include +CFLAGS += -DOSRF_LOG_PARAMS #all: oils_auth.so oils_fetch.so oils_cstore.so all: liboils_idl.so oils_auth.so oils_cstore.so oils_rstore.so oils_dataloader -- 2.43.2