Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF

[opensrf-equinox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 855c1cc..f091593 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,55 +23,55 @@ export APR_HEADERS              = @APR_HEADERS@
 export ETCDIR                   = @sysconfdir@
 export APXS2                    = @APXS2@
 export APACHE2_HEADERS          = @APACHE2_HEADERS@
-export DEF_CFLAGS              = -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @INCLUDES@
-export DEF_LDLIBS              = -lopensrf
-export VAR                     = @localstatedir@
-export PID                     = @localstatedir@/run/opensrf
-export SOCK                    = @localstatedir@/lock/opensrf
-export LOG                     = @localstatedir@/log/opensrf
-export srcdir                  = @srcdir@
-
-ACLOCAL_AMFLAGS = -I m4
+export DEF_CFLAGS               = -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @AM_CPPFLAGS@
+export DEF_LDLIBS               = -lopensrf
+export VAR                      = @localstatedir@
+export PID                      = @localstatedir@/run/opensrf
+export SOCK                     = @localstatedir@/lock/opensrf
+export LOG                      = @localstatedir@/log/opensrf
+export srcdir                   = @srcdir@
+export PERL_BASE                = @PERL_BASE@
+opensrfincludedir               = @includedir@/opensrf
 
 AM_CFLAGS = $(DEF_CFLAGS)
+ACLOCAL_AMFLAGS = -I m4
 
 DISTCLEANFILES = Makefile.in Makefile aclocal.m4 config.guess config.log config.sub config.status configure depcomp install-sh ltmain.sh missing
 
 DOC_FILES = @srcdir@/doc/Application-HOWTO.txt \
-           @srcdir@/doc/dokuwiki-doc-stubber.pl \
-           @srcdir@/doc/OpenSRF-Messaging-Protocol.html \
-           @srcdir@/doc/Persist-API.html \
-           @srcdir@/doc/Roadmap.txt \
-               @srcdir@/AUTHORS \
-               @srcdir@/ChangeLog \
-               @srcdir@/INSTALL \
-               @srcdir@/README
+                       @srcdir@/doc/dokuwiki-doc-stubber.pl \
+                       @srcdir@/doc/OpenSRF-Messaging-Protocol.html \
+                       @srcdir@/doc/Persist-API.html \
+                       @srcdir@/doc/Roadmap.txt \
+                       @srcdir@/AUTHORS \
+                       @srcdir@/ChangeLog \
+                       @srcdir@/INSTALL \
+                       @srcdir@/README
 
 EXAMPLES_FILES = @srcdir@/examples/fieldmapper2cdbi.xsl \
-                @srcdir@/examples/fieldmapper2javascript.xsl \
-                @srcdir@/examples/fieldmapper2perl.xsl \
-                @srcdir@/examples/gen-fieldmapper.xml \
-                @srcdir@/examples/math_bench.pl \
-                @srcdir@/examples/math_client.py \
-                @srcdir@/examples/multisession-test.pl \
-                @srcdir@/examples/register.pl \
-                @srcdir@/examples/srfsh_config.xsd \
-                @srcdir@/examples/math_xul_client/math \
-                @srcdir@/examples/math_xul_client/install.js
+                                @srcdir@/examples/fieldmapper2javascript.xsl \
+                                @srcdir@/examples/fieldmapper2perl.xsl \
+                                @srcdir@/examples/gen-fieldmapper.xml \
+                                @srcdir@/examples/math_bench.pl \
+                                @srcdir@/examples/math_client.py \
+                                @srcdir@/examples/multisession-test.pl \
+                                @srcdir@/examples/srfsh_config.xsd \
+                                @srcdir@/examples/math_xul_client/math \
+                                @srcdir@/examples/math_xul_client/install.js
 
 strn_compat_FILES = @srcdir@/src/ports/strn_compat/strndup.c \
-                   @srcdir@/src/ports/strn_compat/strndup.h \
-                   @srcdir@/src/ports/strn_compat/strnlen.c \
-                   @srcdir@/src/ports/strn_compat/strnlen.h
+                                       @srcdir@/src/ports/strn_compat/strndup.h \
+                                       @srcdir@/src/ports/strn_compat/strnlen.c \
+                                       @srcdir@/src/ports/strn_compat/strnlen.h
 
 python_FILES = @srcdir@/src/python/opensrf.py \
-              @srcdir@/src/python/setup.py \
-              @srcdir@/src/python/srfsh.py \
-              @srcdir@/src/python/osrf
+                          @srcdir@/src/python/setup.py \
+                          @srcdir@/src/python/srfsh.py \
+                          @srcdir@/src/python/osrf
 
 java_FILES = @srcdir@/src/java/deps.inc \
-            @srcdir@/src/java/deps.sh \
-            @srcdir@/src/java/org
+                        @srcdir@/src/java/deps.sh \
+                        @srcdir@/src/java/org
 
 libosrf_FILES = @srcdir@/src/libopensrf/basic_client.c \
                @srcdir@/src/libopensrf/osrf_big_hash.c \
@@ -84,7 +84,7 @@ EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES
 OSRFINC=@srcdir@/include/opensrf
 
 if BUILDCORE
-include_HEADERS = $(OSRFINC)/log.h \
+opensrfinclude_HEADERS = $(OSRFINC)/log.h \
        $(OSRFINC)/md5.h \
        $(OSRFINC)/osrf_application.h \
        $(OSRFINC)/osrf_app_session.h \
@@ -94,7 +94,6 @@ include_HEADERS = $(OSRFINC)/log.h \
        $(OSRFINC)/osrfConfig.h \
        $(OSRFINC)/osrf_hash.h \
        $(OSRFINC)/osrf_json.h \
-       $(OSRFINC)/osrf_json_utils.h \
        $(OSRFINC)/osrf_json_xml.h \
        $(OSRFINC)/osrf_legacy_json.h \
        $(OSRFINC)/osrf_list.h \
@@ -115,14 +114,10 @@ include_HEADERS = $(OSRFINC)/log.h \
        src/gateway/apachetools.h
 endif
 
-SUBDIRS = src
-
-jserver:
-       make -s -C src jserver
-
-jserver-install:
-       make -s -C src jserver-install
+SUBDIRS = src tests
 
 distclean-local:
        rm -rf ./autom4te.cache
        rm -rf ./m4
+
+# vim:noet:ts=4:sw=4: