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

[opensrf-equinox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 048b766..f091593 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,18 +23,18 @@ 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_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
 
-ACLOCAL_AMFLAGS = -I m4
-
 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
 
@@ -55,7 +55,6 @@ EXAMPLES_FILES = @srcdir@/examples/fieldmapper2cdbi.xsl \
                                 @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
@@ -117,12 +116,6 @@ endif
 
 SUBDIRS = src tests
 
-jserver:
-       make -s -C src jserver
-
-jserver-install:
-       make -s -C src jserver-install
-
 distclean-local:
        rm -rf ./autom4te.cache
        rm -rf ./m4