[open-ils-commits] r19143 - branches/rel_2_0/Open-ILS/src/c-apps (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2011-01-09 22:47:37 -0500 (Sun, 09 Jan 2011)
New Revision: 19143

Modified:
   branches/rel_2_0/Open-ILS/src/c-apps/Makefile.am
Log:
Clean up c-apps Makefile.am and make everything load cleanly again

Executable programs don't have library versions, so don't set -version-info
for them.

Add -version-info to liboils_idl and liboils_util, and link liboils_util
explicitly against liboils_idl rather than relying on AM_LDFLAGS.

Set the linking dependencies correctly; if a library links against
liboils_util, set that as the sole link dependency; no need for liboils_idl
once (let alone twice!)


Modified: branches/rel_2_0/Open-ILS/src/c-apps/Makefile.am
===================================================================
--- branches/rel_2_0/Open-ILS/src/c-apps/Makefile.am	2011-01-10 03:47:07 UTC (rev 19142)
+++ branches/rel_2_0/Open-ILS/src/c-apps/Makefile.am	2011-01-10 03:47:37 UTC (rev 19143)
@@ -9,47 +9,49 @@
 
 bin_PROGRAMS = oils_dataloader dump_idl test_json_query test_qstore
 oils_dataloader_SOURCES = oils_dataloader.c
-oils_dataloader_LDFLAGS = $(AM_LDFLAGS) -loils_idl -version-info 2:0:0
+oils_dataloader_LDFLAGS = $(AM_LDFLAGS) -loils_idl
 oils_dataloader_DEPENDENCIES = liboils_idl.la liboils_utils.la
 
 dump_idl_SOURCES = dump_idl.c
-dump_idl_LDFLAGS = $(AM_LDFLAGS) -loils_idl -version-info 2:0:0
+dump_idl_LDFLAGS = $(AM_LDFLAGS) -loils_idl
 dump_idl_DEPENDENCIES = liboils_idl.la liboils_utils.la
 
 test_json_query_SOURCES = test_json_query.c oils_sql.c
 test_json_query_CFLAGS = $(AM_CFLAGS)
-test_json_query_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils -version-info 2:0:0
+test_json_query_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils
 test_json_query_DEPENDENCIES = liboils_idl.la liboils_utils.la
 
 test_qstore_SOURCES = test_qstore.c buildSQL.c oils_buildq.c oils_execsql.c oils_sql.c oils_storedq.c 
 test_qstore_CFLAGS = $(AM_CFLAGS)
-test_qstore_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils -version-info 2:0:0
+test_qstore_LDFLAGS = $(AM_LDFLAGS) -loils_idl -loils_utils
 test_qstore_DEPENDENCIES = liboils_idl.la liboils_utils.la
 
 lib_LTLIBRARIES = liboils_idl.la liboils_utils.la oils_cstore.la oils_qstore.la oils_rstore.la oils_pcrud.la oils_auth.la
 
 liboils_idl_la_SOURCES = oils_idl-core.c
+liboils_idl_la_LDFLAGS = -version-info 2:0:0
 
 liboils_utils_la_SOURCES = oils_utils.c oils_event.c
+liboils_utils_la_LDFLAGS = -loils_idl -version-info 2:0:0
 
 oils_cstore_la_SOURCES = oils_cstore.c oils_sql.c
 oils_cstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0
-oils_cstore_la_DEPENDENCIES = liboils_idl.la liboils_idl.la
+oils_cstore_la_DEPENDENCIES = liboils_utils.la
 
 oils_qstore_la_SOURCES = oils_qstore.c oils_sql.c oils_storedq.c oils_buildq.c buildSQL.c oils_execsql.c
 oils_qstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0
-oils_qstore_la_DEPENDENCIES = liboils_idl.la liboils_idl.la
+oils_qstore_la_DEPENDENCIES = liboils_utils.la
 
 oils_rstore_la_SOURCES = oils_rstore.c oils_sql.c
 oils_rstore_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0
-oils_rstore_la_DEPENDENCIES = liboils_idl.la liboils_idl.la
+oils_rstore_la_DEPENDENCIES = liboils_utils.la
 
 oils_pcrud_la_SOURCES = oils_pcrud.c oils_sql.c
 oils_pcrud_la_LDFLAGS = $(AM_LDFLAGS) -ldbi -ldbdpgsql -loils_utils -module -version-info 2:0:0
-oils_pcrud_la_DEPENDENCIES = liboils_utils.la liboils_idl.la
+oils_pcrud_la_DEPENDENCIES = liboils_utils.la
 
 oils_auth_la_SOURCES = oils_auth.c
 oils_auth_la_LDFLAGS = -module -loils_utils -version-info 2:0:0
-oils_auth_la_DEPENDENCIES = liboils_utils.la liboils_idl.la
+oils_auth_la_DEPENDENCIES = liboils_utils.la