Linking:

  * automake automatically figures out many linking directories;
    remove explicit linking options for . / .libs
TMP files:
  * automake automatically creates a unique directory within TMPDIR;
    remove intermediate /opensrf/ directory (which causes problems for make clean)

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1355 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/Makefile.am b/Makefile.am
index 289b3e3..17da835 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ 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_builddir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @INCLUDES@
-export DEF_LDFLAGS             = -L$(TMPDIR) @LIBDIRS@
 export DEF_LDLIBS              = -lobjson -lopensrf
 export VAR                     = @localstatedir@
 export PID                     = @localstatedir@/run/opensrf
@@ -32,7 +31,6 @@ export SOCK                   = @localstatedir@/lock/opensrf
 export LOG                     = @localstatedir@/log/opensrf
 
 AM_CFLAGS = $(DEF_CFLAGS)
-LDFLAGS = $(DEF_LDFLAGS) -L./src/
 
 SUBDIRS = src
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b58ba6..7056aea 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@
 
 # Declare some directory variables
 
-export TMPDIR  = $(TMP)/opensrf
+export TMPDIR  = $(TMP)
 export OPENSRF = opensrf
 export BINDIR  = @bindir@
 export LIBDIR  = @libdir@

diff --git a/src/c-apps/Makefile.am b/src/c-apps/Makefile.am
index 7ce42dd..c07df0d 100644 (file)
--- a/src/c-apps/Makefile.am
+++ b/src/c-apps/Makefile.am
@@ -13,7 +13,7 @@
 
 
 AM_CFLAGS = $(DEF_CFLAGS) -DORSF_LOG_PARAMS 
-AM_LDFLAGS = $(DEF_LDFLAGS) -L../libopensrf/.libs/ -L.  
+AM_LDFLAGS = $(DEF_LDFLAGS) -L../libopensrf/
 
 noinst_PROGRAMS = timejson
 lib_LTLIBRARIES = libosrf_dbmath.la libosrf_math.la libosrf_version.la

diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am
index 93c6d7d..849fc81 100644 (file)
--- a/src/gateway/Makefile.am
+++ b/src/gateway/Makefile.am
@@ -13,7 +13,7 @@
 
 
 AM_LDFLAGS = $(DEF_LDFLAGS)
-AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS -L../libopensrf/.libs/ 
+AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS -L../libopensrf/
 
 curdir = @abs_top_builddir@/src/gateway/
 

diff --git a/src/jserver/Makefile.am b/src/jserver/Makefile.am
index 3763e40..c0e61a7 100644 (file)
--- a/src/jserver/Makefile.am
+++ b/src/jserver/Makefile.am
@@ -13,7 +13,7 @@
 
 
 LDADD = -lxml2 $(DEF_LDLIBS)
-AM_CFLAGS = $(DEF_CFLAGS) -D_GNU_SOURCE -L../libopensrf/.libs/
+AM_CFLAGS = $(DEF_CFLAGS) -D_GNU_SOURCE -L../libopensrf/
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
 bin_PROGRAMS = chopchop

diff --git a/src/libopensrf/Makefile.am b/src/libopensrf/Makefile.am
index 0afb912..67cc4ab 100644 (file)
--- a/src/libopensrf/Makefile.am
+++ b/src/libopensrf/Makefile.am
@@ -12,7 +12,7 @@
 # GNU General Public License for more details.
 
 
-AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS  -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing -L./.libs/ -DOSRF_JSON_ENABLE_XML_UTILS
+AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS  -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing -DOSRF_JSON_ENABLE_XML_UTILS
 AM_LDFLAGS = $(DEF_LDFLAGS)
 LDADD = -lxml2 -ldl -lmemcache -lopensrf -lobjson
 

diff --git a/src/router/Makefile.am b/src/router/Makefile.am
index 4532ebb..e3e3ade 100644 (file)
--- a/src/router/Makefile.am
+++ b/src/router/Makefile.am
@@ -13,7 +13,7 @@
 
 
 LDADD = -lxml2 $(DEF_LDLIBS) 
-AM_CFLAGS = $(DEF_CFLAGS) -D_ROUTER -L../libopensrf/.libs/
+AM_CFLAGS = $(DEF_CFLAGS) -D_ROUTER -L../libopensrf/
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
 bin_PROGRAMS = opensrf_router

diff --git a/src/srfsh/Makefile.am b/src/srfsh/Makefile.am
index d184f75..fb234b4 100644 (file)
--- a/src/srfsh/Makefile.am
+++ b/src/srfsh/Makefile.am
@@ -13,7 +13,7 @@
 
 
 LDADD = -lreadline -lxml2 -lncurses $(DEF_LDLIBS) 
-AM_CFLAGS = $(DEF_CFLAGS) -DEXEC_DEFAULT -L../libopensrf/.libs/ 
+AM_CFLAGS = $(DEF_CFLAGS) -DEXEC_DEFAULT -L../libopensrf/
 AM_LDFLAGS = $(DEF_LDFLAGS)
 
 bin_PROGRAMS = srfsh