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

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-01-22 12:35:18 -0500 (Tue, 22 Jan 2008)
New Revision: 8459

Added:
   trunk/Open-ILS/include/
   trunk/Open-ILS/include/openils/
Removed:
   trunk/Open-ILS/src/c-apps/openils/
Modified:
   trunk/Open-ILS/src/Makefile
   trunk/Open-ILS/src/c-apps/Makefile
   trunk/Open-ILS/src/extras/Makefile
   trunk/Open-ILS/src/extras/Makefile.install
Log:
Enable build via relative header file and library locations within the build tree
We had been depending on files existing in /openils/ - egg-and-chicken style


Copied: trunk/Open-ILS/include/openils (from rev 8457, trunk/Open-ILS/src/c-apps/openils)

Modified: trunk/Open-ILS/src/Makefile
===================================================================
--- trunk/Open-ILS/src/Makefile	2008-01-22 17:00:04 UTC (rev 8458)
+++ trunk/Open-ILS/src/Makefile	2008-01-22 17:35:18 UTC (rev 8459)
@@ -2,7 +2,7 @@
 
 export LDFLAGS			+= -L . -L$(TMP) -L $(OPENSRF_LIBS)
 export CFLAGS			+= -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \
-				-D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) -I$(OPENSRF_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-22 17:00:04 UTC (rev 8458)
+++ trunk/Open-ILS/src/c-apps/Makefile	2008-01-22 17:35:18 UTC (rev 8459)
@@ -1,6 +1,6 @@
 LDLIBS += -lobjson -lopensrf #-lfieldmapper 
 LDFLAGS += -Wl,-rpath=$(LIBDIR) -L$(DBI_LIBS)
-CFLAGS += -DOSRF_LOG_PARAMS
+CFLAGS += -DOSRF_LOG_PARAMS -I../../include
 
 #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
@@ -22,7 +22,7 @@
 	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $@
 
 oils_rstore.o:	oils_cstore.c
-	$(CC) $(CFLAGS) -I$(TMP) -DRSTORE -c -o $@ oils_cstore.c 
+	$(CC) $(CFLAGS) -DRSTORE -c -o $@ oils_cstore.c 
 
 oils_rstore.so:	oils_rstore.o liboils_utils.so liboils_idl.so
 	@echo $@
@@ -36,11 +36,7 @@
 
 liboils_idl.so:	oils_idl-core.o
 	@echo $@
-	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@
-#	cp $@ $(TMP)/
-#	mkdir -p $(TMP)/openils/
-#	cp oils_idl.h $(TMP)/openils/
-#	cp idl_fieldmapper.h $(TMP)/openils/
+	$(CC) $(CFLAGS) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@
 
 oils_auth.so:	oils_auth.o liboils_utils.so
 	@echo $@
@@ -49,16 +45,10 @@
 liboils_utils.so:	oils_utils.o oils_event.o
 	@echo $@
 	$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_utils.o oils_event.o -o $@
-#	cp $@ $(TMP)/
-#	mkdir -p $(TMP)/openils/
-#	cp oils_event.h $(TMP)/openils/
-#	cp oils_utils.h $(TMP)/openils/
-#	cp oils_constants.h $(TMP)/openils/
 
 install:
 	@echo $@;
 	cp oils_auth.so $(LIBDIR)/
-	#cp $(TMP)/oils_fetch.so $(LIBDIR)/
 	cp oils_cstore.so $(LIBDIR)/
 	cp oils_rstore.so $(LIBDIR)/
 	cp liboils_utils.so $(LIBDIR)/

Modified: trunk/Open-ILS/src/extras/Makefile
===================================================================
--- trunk/Open-ILS/src/extras/Makefile	2008-01-22 17:00:04 UTC (rev 8458)
+++ trunk/Open-ILS/src/extras/Makefile	2008-01-22 17:35:18 UTC (rev 8459)
@@ -1,4 +1,5 @@
-LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl
+LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl -L../c-apps
+CFLAGS += -I../../include
 all:	oils_requestor
 
 oils_requestor:	oils_requestor.o

Modified: trunk/Open-ILS/src/extras/Makefile.install
===================================================================
--- trunk/Open-ILS/src/extras/Makefile.install	2008-01-22 17:00:04 UTC (rev 8458)
+++ trunk/Open-ILS/src/extras/Makefile.install	2008-01-22 17:35:18 UTC (rev 8459)
@@ -28,8 +28,8 @@
 # not require fetching the sources externally ... needs testing/updating in here
 
  
-LIBJS=js-1.60
-LIBJS_PERL=JavaScript-SpiderMonkey-0.17
+LIBJS=js-1.7.0
+LIBJS_PERL=JavaScript-SpiderMonkey-0.19
 LIBJS_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
 LIBJS_PERL_URL=ftp://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
 # used for installing libjs lib and header files
@@ -95,10 +95,10 @@
     libreadline5-dev\
 	libtext-csv-perl\
 	libspreadsheet-writeexcel-perl\
-	libtie-ixhash-perl
+	libtie-ixhash-perl\
+	python-setuptools 
 
 
-
 GENTOOS = \
     vim\
     ntp\
@@ -204,7 +204,7 @@
 	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/
 	cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/
-	cd JavaScript-SpiderMonkey-0.17 && perl Makefile.PL -E4X && make && make test && make install
+	cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
 
 
 # Install libdbi and the postgres drivers