Diederik has submitted this change and it was merged. Change subject: Separation of libraries in Makefile.am ......................................................................
Separation of libraries in Makefile.am * libdclass is created * libdclassjni depends on libdclass Change-Id: I0845ce8526d629334faf4d9cbdf7f42284c76da0 --- M Makefile.am M configure.ac 2 files changed, 20 insertions(+), 11 deletions(-) Approvals: Diederik: Verified; Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index c2f5e42..9d4b397 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,27 @@ CFLAGS= LDFLAGS= SOVERSION = 2 -lib_LTLIBRARIES = libdclassjni.la +lib_LTLIBRARIES = libdclass.la libdclassjni.la AUTOMAKE_OPTIONS = foreign -libdclassjni_la_SOURCES = src/dtree_core.c \ - src/openddr_client.c \ - src/dclass_file.c \ - src/dtree_mem.c \ - src/dtree_util.c \ - src/dclass_client.c \ - java-wikimedia/dclass-wrapper.c +libdclass_la_SOURCES = src/dtree_core.c \ + src/openddr_client.c \ + src/dclass_file.c \ + src/dtree_mem.c \ + src/dtree_util.c \ + src/dclass_client.c + +libdclass_la_LDFLAGS = -D__X86_64__ -fPIC -shared -DSHARED_OBJECT -Wl +libdclass_ladir = $(CURDIR) -libdclassjni_la_CFLAGS = -g -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wall -I ./jni/ -I./src/ -#libdclassjni_la_LDFLAGS = -D__X86_64__ -fPIC -shared -DSHARED_OBJECT -Wl,--no-undefined -libdclassjni_la_LDFLAGS = -D__X86_64__ -fPIC -shared -DSHARED_OBJECT -Wl + +libdclassjni_la_SOURCES = java-wikimedia/dclass-wrapper.c +libdclassjni_ladir = $(CURDIR)/.libs +#libdclassjni_la_LIBRARIES = libdclass.so +libdclassjni_la_CFLAGS = -g -I$(CURDIR)/.libs -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wall -I ./jni/ -I./src/ -ldclass + + +#libdclassjni_la_CFLAGS = -g -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Wall -I ./jni/ -I./src/ +#libdclassjni_la_LDFLAGS = -D__X86_64__ -fPIC -shared -DSHARED_OBJECT -Wl diff --git a/configure.ac b/configure.ac index 16e731b..1f207ea 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,7 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE AC_USE_SYSTEM_EXTENSIONS +LT_INIT([disable-static]) # Checks for programs. AC_PROG_AWK -- To view, visit https://gerrit.wikimedia.org/r/68703 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0845ce8526d629334faf4d9cbdf7f42284c76da0 Gerrit-PatchSet: 1 Gerrit-Project: analytics/dclass Gerrit-Branch: wikimedia Gerrit-Owner: Stefan.petrea <[email protected]> Gerrit-Reviewer: Diederik <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
