8c78974c57
to remove "-Wl,-soname" because (as I was told) "we don't do that"... Ok well, this break things, so put my soname back.
56 lines
2.3 KiB
Plaintext
56 lines
2.3 KiB
Plaintext
$OpenBSD: patch-client_Makefile_in,v 1.10 2012/09/29 19:27:33 ajacoutot Exp $
|
|
--- client/Makefile.in.orig Wed Sep 26 20:07:41 2012
|
|
+++ client/Makefile.in Thu Sep 27 10:04:02 2012
|
|
@@ -55,7 +55,7 @@ POST_UNINSTALL = :
|
|
DIST_COMMON = $(dconfclientinclude_HEADERS) $(dconfinclude_HEADERS) \
|
|
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|
$(srcdir)/dconf.pc.in $(top_srcdir)/Makefile.gtester
|
|
-shlib_PROGRAMS = libdconf.so.1.0.0$(EXEEXT)
|
|
+shlib_PROGRAMS = libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
|
|
subdir = client
|
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
|
@@ -306,7 +306,7 @@ top_srcdir = @top_srcdir@
|
|
# initialize variables for unconditional += appending
|
|
TEST_PROGS =
|
|
shlibdir = $(libdir)
|
|
-nodist_noinst_DATA = libdconf.so.1 libdconf.so
|
|
+nodist_noinst_DATA =
|
|
noinst_LIBRARIES = libdconf-client.a
|
|
dconfinclude_HEADERS = dconf.h
|
|
dconfclientinclude_HEADERS = dconf-client.h
|
|
@@ -324,7 +324,7 @@ libdconf_so_1_0_0_LDADD = \
|
|
../shm/libdconf-shm-shared.a \
|
|
$(gio_LIBS)
|
|
|
|
-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
|
|
+libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.${LIBdconf_VERSION}
|
|
libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
|
|
EXTRA_DIST = dconf.vapi dconf.deps
|
|
vapi_DATA = dconf.vapi dconf.deps
|
|
@@ -416,8 +416,8 @@ uninstall-shlibPROGRAMS:
|
|
|
|
clean-shlibPROGRAMS:
|
|
-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
|
|
-libdconf.so.1.0.0$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
|
|
- @rm -f libdconf.so.1.0.0$(EXEEXT)
|
|
+libdconf.so.${LIBdconf_VERSION}$(EXEEXT): $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_1_0_0_DEPENDENCIES)
|
|
+ @rm -f libdconf.so.${LIBdconf_VERSION}$(EXEEXT)
|
|
$(AM_V_CCLD)$(libdconf_so_1_0_0_LINK) $(libdconf_so_1_0_0_OBJECTS) $(libdconf_so_1_0_0_LDADD) $(LIBS)
|
|
|
|
mostlyclean-compile:
|
|
@@ -837,13 +837,6 @@ test-report perf-report full-report: ${TEST_PROGS}
|
|
|
|
# run tests in cwd as part of make check
|
|
check-local: test-nonrecursive
|
|
-
|
|
-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
|
|
- $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
|
|
-
|
|
-install-data-hook:
|
|
- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
|
|
- ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
|
|
|
|
uninstall-hook:
|
|
rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
|