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

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8459 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/c-apps/openils/idl_fieldmapper.h b/Open-ILS/include/openils/idl_fieldmapper.h
similarity index 100%
rename from Open-ILS/src/c-apps/openils/idl_fieldmapper.h
rename to Open-ILS/include/openils/idl_fieldmapper.h

diff --git a/Open-ILS/src/c-apps/openils/oils_constants.h b/Open-ILS/include/openils/oils_constants.h
similarity index 100%
rename from Open-ILS/src/c-apps/openils/oils_constants.h
rename to Open-ILS/include/openils/oils_constants.h

diff --git a/Open-ILS/src/c-apps/openils/oils_event.h b/Open-ILS/include/openils/oils_event.h
similarity index 100%
rename from Open-ILS/src/c-apps/openils/oils_event.h
rename to Open-ILS/include/openils/oils_event.h

diff --git a/Open-ILS/src/c-apps/openils/oils_idl.h b/Open-ILS/include/openils/oils_idl.h
similarity index 100%
rename from Open-ILS/src/c-apps/openils/oils_idl.h
rename to Open-ILS/include/openils/oils_idl.h

diff --git a/Open-ILS/src/c-apps/openils/oils_utils.h b/Open-ILS/include/openils/oils_utils.h
similarity index 100%
rename from Open-ILS/src/c-apps/openils/oils_utils.h
rename to Open-ILS/include/openils/oils_utils.h

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index fff0bad..ec7082c 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -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/"
 

diff --git a/Open-ILS/src/c-apps/Makefile b/Open-ILS/src/c-apps/Makefile
index c39465c..1f1d852 100644 (file)
--- 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
+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 @@ oils_cstore.so:       oils_cstore.o liboils_utils.so liboils_idl.so
        $(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 @@ oils_idl-core.o:     oils_idl-core.c
 
 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 @@ oils_auth.so:       oils_auth.o liboils_utils.so
 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)/

diff --git a/Open-ILS/src/extras/Makefile b/Open-ILS/src/extras/Makefile
index aa4d3c7..40ae124 100644 (file)
--- a/Open-ILS/src/extras/Makefile
+++ b/Open-ILS/src/extras/Makefile
@@ -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

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 365be27..bfc3b48 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -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,8 +95,8 @@ DEBS =  \
     libreadline5-dev\
        libtext-csv-perl\
        libspreadsheet-writeexcel-perl\
-       libtie-ixhash-perl
-
+       libtie-ixhash-perl\
+       python-setuptools 
 
 
 GENTOOS = \
@@ -204,7 +204,7 @@ install_js_sm:
        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