From d467402b72058e0fe9ae6874ff5c170bdeb6aa9c Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 3 Apr 2006 15:30:12 +0000 Subject: [PATCH] removing xmlbuilder from the build process making sure offline.pl is executable git-svn-id: svn://svn.open-ils.org/ILS/trunk@3539 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/Makefile | 13 +++---------- Open-ILS/src/apachemods/Makefile | 13 ++----------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile index 83c099ec63..d21ba21435 100644 --- a/Open-ILS/src/Makefile +++ b/Open-ILS/src/Makefile @@ -8,11 +8,11 @@ export INCDIR = "$(INCLUDEDIR)/openils/" export STAFF_CLIENT_BUILD_ID = `/bin/cat ../xul/staff_client/build/BUILD_ID` -all: mod_xmlbuilder mod_ils_rest_gateway c_apps client-xul mod_xmlent +all: mod_ils_rest_gateway c_apps client-xul mod_xmlent install: perl-install web-install server-xul string-templates-install storage-bootstrap cgi-bootstrap xsl-install c_apps-install circ_rules-install offline-install -web-install: webcore-install autojs-install mod_xmlbuilder-install mod_ils_rest_gateway-install mod_xmlent-install offline-install +web-install: webcore-install autojs-install mod_ils_rest_gateway-install mod_xmlent-install offline-install circ_rules-install: @echo $@ @@ -35,10 +35,6 @@ mod_xmlent: @echo $@ make -C apachemods mod_xmlent.so -mod_xmlbuilder: - @echo $@ - make -C apachemods mod_xmlbuilder.so - oils_cgi: @echo $@ make -C apachemods oils_cgi.so @@ -47,10 +43,6 @@ oils_cgi-install: @echo $@ make -C apachemods oils_cgi-install -mod_xmlbuilder-install: - @echo $@ - make -C apachemods mod_xmlbuilder-install - mod_xmlent-install: @echo $@ make -C apachemods mod_xmlent-install @@ -144,6 +136,7 @@ offline-install: perl -pe "s{##CONFIG##}{$(ETCDIR)}" < offline/offline.pl > $(TMP)/offline.pl; cp offline/offline-config.pl $(ETCDIR) cp $(TMP)/offline.pl $(CGIDIR)/offline/ + chmod +x $(CGIDIR)/offline/offline.pl # ----------------------------------------------------------------------------------- diff --git a/Open-ILS/src/apachemods/Makefile b/Open-ILS/src/apachemods/Makefile index 5a99b2e770..70b6054a63 100644 --- a/Open-ILS/src/apachemods/Makefile +++ b/Open-ILS/src/apachemods/Makefile @@ -1,12 +1,11 @@ LDLIBS += -lxml2 -lopensrf -lxslt -all: mod_xmlbuilder.so mod_ils_rest_gateway.so mod_xmlent.so +all: mod_ils_rest_gateway.so mod_xmlent.so -install: mod_xmlbuilder-install mod_ils_rest_gateway-install libfieldmapper-install mod_xmlent-install +install: mod_ils_rest_gateway-install libfieldmapper-install mod_xmlent-install -mod_xmlbuilder.o: mod_xmlbuilder.h mod_xmlbuilder.c apachetools.o: cp ../../../OpenSRF/src/gateway/apachetools.o . json_xml.o: json_xml.c json_xml.h @@ -26,11 +25,6 @@ mod_xmlent.so: mod_xmlent.o # ------------------------------------------------------ -mod_xmlbuilder.so: mod_xmlbuilder.o apachetools.o -#mod_xmlbuilder.so: mod_xmlbuilder.o - @echo $@ - $(CC) $(LDFLAGS) $(LDLIBS) -shared -W1 apachetools.o mod_xmlbuilder.o -o $@ - libfieldmapper.so: fieldmapper_lookup.o @echo $@ mkdir -p $(TMPDIR)/openils/ @@ -65,9 +59,6 @@ mod_ils_rest_gateway-install: echo "-----------------------------------------------"; echo "" -mod_xmlbuilder-install: - $(APXS2) -i -a -n xmlbuilder mod_xmlbuilder.so - mod_xmlent-install: $(APXS2) -i -a -n xmlent mod_xmlent.so -- 2.43.2