[open-ils-commits] r8554 - in trunk/Open-ILS/src: . c-apps

[svn at svn.open-ils.org]

Author: miker
Date: 2008-01-31 15:13:05 -0500 (Thu, 31 Jan 2008)
New Revision: 8554

Modified:
   trunk/Open-ILS/src/Makefile
   trunk/Open-ILS/src/c-apps/Makefile
Log:
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)

Modified: trunk/Open-ILS/src/Makefile
===================================================================
--- trunk/Open-ILS/src/Makefile	2008-01-31 19:59:04 UTC (rev 8553)
+++ trunk/Open-ILS/src/Makefile	2008-01-31 20:13:05 UTC (rev 8554)
@@ -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/"

Modified: trunk/Open-ILS/src/c-apps/Makefile
===================================================================
--- trunk/Open-ILS/src/c-apps/Makefile	2008-01-31 19:59:04 UTC (rev 8553)
+++ trunk/Open-ILS/src/c-apps/Makefile	2008-01-31 20:13:05 UTC (rev 8554)
@@ -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