r22200 - gnucash/trunk/src/backend/dbi - Fix compilation on OSX

John Ralls jralls at code.gnucash.org
Tue May 22 13:57:22 EDT 2012


Author: jralls
Date: 2012-05-22 13:57:22 -0400 (Tue, 22 May 2012)
New Revision: 22200
Trac: http://svn.gnucash.org/trac/changeset/22200

Modified:
   gnucash/trunk/src/backend/dbi/Makefile.am
   gnucash/trunk/src/backend/dbi/test/Makefile.am
Log:
Fix compilation on OSX

One can't link a library created with -module on OSX, but one can dload
a library compiled with -shared on both OSX and Linux.

Also cleaned out the old "make check" files from test/Makefile.am

Modified: gnucash/trunk/src/backend/dbi/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/Makefile.am	2012-05-21 22:36:15 UTC (rev 22199)
+++ gnucash/trunk/src/backend/dbi/Makefile.am	2012-05-22 17:57:22 UTC (rev 22200)
@@ -26,7 +26,7 @@
   gnc-backend-dbi.h \
   gnc-backend-dbi-priv.h
 
-libgncmod_backend_dbi_la_LDFLAGS = -module -avoid-version
+libgncmod_backend_dbi_la_LDFLAGS = -shared -avoid-version
 libgncmod_backend_dbi_la_LIBADD = \
    ${GLIB_LIBS} \
    ${GCONF_LIBS} \

Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am	2012-05-21 22:36:15 UTC (rev 22199)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am	2012-05-22 17:57:22 UTC (rev 22200)
@@ -28,12 +28,6 @@
         ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
-#TESTS = \
-#  test-dbi-basic \
-#  test-dbi \
-#  test-dbi-business \
-#  test-load-backend
-
 GNC_TEST_DEPS = \
   --gnc-module-dir ${top_builddir}/src/engine \
   --guile-load-dir ${top_builddir}/src/engine \
@@ -48,12 +42,6 @@
   ${gnc_dbd_dir_override} \
   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
-#check_PROGRAMS = \
-#  test-dbi-basic \
-#  test-dbi \
-#  test-dbi-business \
-#  test-load-backend
-
 EXTRA_DIST += \
     test-dbi-stuff.h \
     test-dbi-business-stuff.h
@@ -63,22 +51,7 @@
 
 noinst_PROGRAMS = ${TEST_PROGS} ${CHECK_PROGS}
 
-#check_LTLIBRARIES=libgncmod-test-dbi.la
 
-#libgncmod_test_dbi_la_SOURCES = \
-#    test-dbi-stuff.c
-libgncmod_test_dbi_la_LDFLAGS = -module
-
-test_dbi_business_SOURCES = \
-  test-dbi-business.c \
-  test-dbi-business-stuff.c
-
-test_dbi_basic_SOURCES = \
-  test-dbi-basic.c
-
-test_dbi_SOURCES = \
-  test-dbi.c
-
 if CUSTOM_GNC_DBD_DIR
 gnc_dbd_dir_override = GNC_DBD_DIR="@GNC_DBD_DIR@"
 endif



More information about the gnucash-changes mailing list