Changeset 9443 for branches/acq-experiment/Open-ILS/src/apachemods/Makefile

Timestamp:

04/23/08 20:38:57 (3 months ago)

Author:

erickson

Message:

Merged revisions 9437,9440-9442 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9437 | erickson | 2008-04-22 22:50:31 -0400 (Tue, 22 Apr 2008) | 1 line

fixed what appears to be some copy paste errors. no longer requiring kwargs to be non-null on User create

........

r9440 | miker | 2008-04-23 08:23:10 -0400 (Wed, 23 Apr 2008) | 1 line

adding helper views for overdue, running and pending reports

........

r9441 | erickson | 2008-04-23 11:13:45 -0400 (Wed, 23 Apr 2008) | 4 lines

Removing dead code and their makefile counterparts

........

r9442 | miker | 2008-04-23 13:17:15 -0400 (Wed, 23 Apr 2008) | 1 line

adding translation for description

........

Location:

branches/acq-experiment

Files:

• . (modified) (1 prop)
• Open-ILS/src/apachemods/Makefile (modified) (3 diffs)

branches/acq-experiment/Open-ILS/src/apachemods/Makefile

@@ -1 @@
-
 LDLIBS  += -lxml2 -lopensrf -lxslt
 
-all:    mod_xmlent.so libfieldmapper.so
+all:    mod_xmlent.so
 
-install: libfieldmapper-install mod_xmlent-install
-
-
-apachetools.o: 
-        cp ../../../OpenSRF/src/gateway/apachetools.o .
-
-json_xml.o:     json_xml.c json_xml.h
-
-fieldmapper_lookup.o:   fieldmapper_lookup.c fieldmapper_lookup.h 
-
-
-fieldmapper_lookup.c:   
-        ./fieldmapper_lookup-gen.pl fieldmapper_lookup.c
-
+install: mod_xmlent-install
 
 mod_xmlent.o:   mod_xmlent.c
@@ -23 +9 @@
         @echo $@
         $(CC) $(LDFLAGS) $(LDLIBS) -shared -W1 mod_xmlent.o -lexpat -o $@
-
-
-# ------------------------------------------------------
-
-libfieldmapper.so:      fieldmapper_lookup.o
-        @echo $@
-        mkdir -p $(TMPDIR)/openils/
-        cp fieldmapper_lookup.h $(TMPDIR)/openils/
-        $(CC) $(LDFLAGS) $(LDLIBS) -shared -W1 fieldmapper_lookup.o -o $@
-        cp libfieldmapper.so $(TMPDIR)/libfieldmapper.so
-
-# ------------------------------------------------------
-
-
-libfieldmapper-install: libfieldmapper.so
-        echo installing libfieldmapper.so
-        mkdir -p $(INCDIR)/
-        @echo "Copying fieldmapper_lookup.h to $(INCDIR)"
-        cp fieldmapper_lookup.h $(INCDIR)/
-        cp libfieldmapper.so $(LIBDIR)/libfieldmapper.so
-
 
 mod_xmlent-install:
@@ -52 +17 @@
         echo $@
         /bin/rm -f *.o *.so 
-        /bin/rm -f fieldmapper_lookup.c
-
-