From 43864a32204bf109593cbfbc5801f89cf39b7bfa Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jul 2016 11:37:42 +0000 Subject: [PATCH] -separate mysql plugin build from sqlite, FTBFS so not active for now --- po/POTFILES.in | 1 + src/psycstore/Makefile.am | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 97732d8b4..067d12f4d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -277,6 +277,7 @@ src/pq/pq_result_helper.c src/psyc/gnunet-service-psyc.c src/psyc/psyc_api.c src/psycstore/gnunet-service-psycstore.c +src/psycstore/plugin_psycstore_mysql.c src/psycstore/plugin_psycstore_sqlite.c src/psycstore/psycstore_api.c src/psycutil/psyc_env.c diff --git a/src/psycstore/Makefile.am b/src/psycstore/Makefile.am index add6b3ee9..ee61b8c78 100644 --- a/src/psycstore/Makefile.am +++ b/src/psycstore/Makefile.am @@ -55,14 +55,24 @@ gnunet_service_psycstore_LDADD = \ plugin_LTLIBRARIES = \ $(SQLITE_PLUGIN) -libgnunet_plugin_psycstore_sqlite_la_SOURCES = \ - plugin_psycstore_sqlite.c \ +libgnunet_plugin_psycstore_mysql_la_SOURCES = \ plugin_psycstore_mysql.c -libgnunet_plugin_psycstore_sqlite_la_LIBADD = \ +libgnunet_plugin_psycstore_mysql_la_LIBADD = \ libgnunetpsycstore.la \ $(top_builddir)/src/my/libgnunetmy.la \ $(top_builddir)/src/mysql/libgnunetmysql.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ + $(LTLIBINTL) +libgnunet_plugin_psycstore_mysql_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + + +libgnunet_plugin_psycstore_sqlite_la_SOURCES = \ + plugin_psycstore_sqlite.c +libgnunet_plugin_psycstore_sqlite_la_LIBADD = \ + libgnunetpsycstore.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ $(LTLIBINTL) libgnunet_plugin_psycstore_sqlite_la_LDFLAGS = \ @@ -98,4 +108,3 @@ test_plugin_psycstore_sqlite_SOURCES = \ test_plugin_psycstore_sqlite_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la - -- 2.25.1