[Opensrf-commits] r1354 - trunk/src/c-apps

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-06-30 22:03:46 -0400 (Mon, 30 Jun 2008)
New Revision: 1354

Modified:
   trunk/src/c-apps/Makefile.am
Log:
A little more autotools love:
  * Avoid the use of tmp dir by using noinst_ prefix for timejson
  * Remove DEF_LDLIBS usage (it enabled compiling, but did not link to the
    libraries) and replace with specific LDADD and LIBADD options


Modified: trunk/src/c-apps/Makefile.am
===================================================================
--- trunk/src/c-apps/Makefile.am	2008-07-01 01:15:09 UTC (rev 1353)
+++ trunk/src/c-apps/Makefile.am	2008-07-01 02:03:46 UTC (rev 1354)
@@ -12,20 +12,20 @@
 # GNU General Public License for more details.
 
 
-# for libtool
-tmpdir = $(TMP)
-
 AM_CFLAGS = $(DEF_CFLAGS) -DORSF_LOG_PARAMS 
-LDADD = $(DEF_LDLIBS)
-AM_LDFLAGS = $(DEF_LDFLAGS) -L$(TMP)/opensrf/ -L../libopensrf/.libs/ -L.  
+AM_LDFLAGS = $(DEF_LDFLAGS) -L../libopensrf/.libs/ -L.  
 
-tmp_PROGRAMS = timejson
+noinst_PROGRAMS = timejson
 lib_LTLIBRARIES = libosrf_dbmath.la libosrf_math.la libosrf_version.la
 
 timejson_SOURCES = timejson.c
+timejson_LDADD = -lobjson -lopensrf
 libosrf_dbmath_la_SOURCES = osrf_dbmath.c 
+libosrf_dbmath_la_LIBADD = -lobjson -lopensrf
 libosrf_math_la_SOURCES = osrf_math.c
+libosrf_math_la_LIBADD = -lobjson -lopensrf
 libosrf_version_la_SOURCES = osrf_version.c 
+libosrf_version_la_LIBADD = -lobjson -lopensrf
 
 ## rename libraries (libtool requires the prefix lib, but we dont use that here)
 ## remove extra library files created by libtool