[Opensrf-commits] r1378 - trunk/src/gateway

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-07-29 09:17:03 -0400 (Tue, 29 Jul 2008)
New Revision: 1378

Modified:
   trunk/src/gateway/Makefile.am
Log:
Give Apache modules the support they need to work
Push the apxs compile stage into the local install steps as it seems to require root privileges to write during build


Modified: trunk/src/gateway/Makefile.am
===================================================================
--- trunk/src/gateway/Makefile.am	2008-07-28 16:06:27 UTC (rev 1377)
+++ trunk/src/gateway/Makefile.am	2008-07-29 13:17:03 UTC (rev 1378)
@@ -14,13 +14,12 @@
 
 EXTRA_DIST = @srcdir@/apachetools.c @srcdir@/apachetools.h @srcdir@/osrf_json_gateway.c @srcdir@/osrf_http_translator.c
 
-options=-D_LARGEFILE64_SOURCE -Wall -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -L$(LIBDIR) -L at top_builddir@/src/libopensrf
+AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I at abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
+AM_LDFLAGS = -L$(LIBDIR) -L at top_builddir@/src/libopensrf
 
-all-local:
-	$(APXS2) -c $(DEF_LDLIBS) $(options) @srcdir@/osrf_json_gateway.c
-	$(APXS2) -c $(DEF_LDLIBS) $(options) @srcdir@/osrf_http_translator.c
-
 install-exec-local: 
+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
 	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la
 	$(APXS2) -i -a @srcdir@/osrf_http_translator.la