[Opensrf-commits] r1355 - in trunk: . src src/c-apps src/gateway src/jserver src/libopensrf src/router src/srfsh

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-06-30 23:33:23 -0400 (Mon, 30 Jun 2008)
New Revision: 1355

Modified:
   trunk/Makefile.am
   trunk/src/Makefile.am
   trunk/src/c-apps/Makefile.am
   trunk/src/gateway/Makefile.am
   trunk/src/jserver/Makefile.am
   trunk/src/libopensrf/Makefile.am
   trunk/src/router/Makefile.am
   trunk/src/srfsh/Makefile.am
Log:
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)


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -24,7 +24,6 @@
 export APXS2                    = @APXS2@
 export APACHE2_HEADERS          = @APACHE2_HEADERS@
 export DEF_CFLAGS		= -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I at 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 LOG			= @localstatedir@/log/opensrf
 
 AM_CFLAGS = $(DEF_CFLAGS)
-LDFLAGS = $(DEF_LDFLAGS) -L./src/
 
 SUBDIRS = src
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -14,7 +14,7 @@
 
 # Declare some directory variables
 
-export TMPDIR	= $(TMP)/opensrf
+export TMPDIR	= $(TMP)
 export OPENSRF	= opensrf
 export BINDIR	= @bindir@
 export LIBDIR	= @libdir@

Modified: trunk/src/c-apps/Makefile.am
===================================================================
--- trunk/src/c-apps/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/c-apps/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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

Modified: trunk/src/gateway/Makefile.am
===================================================================
--- trunk/src/gateway/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/gateway/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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/
 

Modified: trunk/src/jserver/Makefile.am
===================================================================
--- trunk/src/jserver/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/jserver/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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

Modified: trunk/src/libopensrf/Makefile.am
===================================================================
--- trunk/src/libopensrf/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/libopensrf/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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
 

Modified: trunk/src/router/Makefile.am
===================================================================
--- trunk/src/router/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/router/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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

Modified: trunk/src/srfsh/Makefile.am
===================================================================
--- trunk/src/srfsh/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
+++ trunk/src/srfsh/Makefile.am	2008-07-01 03:33:23 UTC (rev 1355)
@@ -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