1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
|
Description: Do not build java module with a soname and do not generate symlinks
Author: Laurent Bigonville <bigon@debian.org>
Date: Tue, 13 Mar 2012 21:54:24 +0100
--- a/libapol/swig/java/Makefile.am
+++ b/libapol/swig/java/Makefile.am
@@ -1,4 +1,4 @@
-wrappedso_DATA = libjapol.so.@libapol_version@
+wrappedso_DATA = libjapol.so
wrappedso_SONAME = @libapol_jswig_soname@
short_name = libjapol.so
wrappedsodir = $(libdir)
@@ -79,9 +79,7 @@ $(firstword $(BUILT_SOURCES)): $(dist_no
$(wordlist 2,$(words $(BUILT_SOURCES)), $(BUILT_SOURCES)): $(firstword $(BUILT_SOURCES))
$(wrappedso_DATA): $(filter %.c, $(BUILT_SOURCES))
- $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -Wl,-soname,$(wrappedso_SONAME)
- $(LN_S) -f $@ $(wrappedso_SONAME)
- $(LN_S) -f $@ $(short_name)
+ $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
# Intentionally do not include SWIGTYPE_p_void.java below so that the
# Java compiler uses the one created in package
@@ -107,8 +105,6 @@ $(wrappedjar_DATA): $(classes)
$(JAR) cfm $@ MANIFEST.MF $^
install-data-hook:
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
$(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
--- a/libpoldiff/swig/java/Makefile.am
+++ b/libpoldiff/swig/java/Makefile.am
@@ -1,4 +1,4 @@
-wrappedso_DATA = libjpoldiff.so.@libpoldiff_version@
+wrappedso_DATA = libjpoldiff.so
wrappedso_SONAME = @libpoldiff_jswig_soname@
short_name = libjpoldiff.so
wrappedsodir = $(libdir)
@@ -54,9 +54,7 @@ $(firstword $(BUILT_SOURCES)): $(dist_no
$(wordlist 2,$(words $(BUILT_SOURCES)), $(BUILT_SOURCES)): $(firstword $(BUILT_SOURCES))
$(wrappedso_DATA): $(filter %.c, $(BUILT_SOURCES))
- $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS) -Wl,-soname,$(wrappedso_SONAME)
- $(LN_S) -f $@ $(wrappedso_SONAME)
- $(LN_S) -f $@ $(short_name)
+ $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS)
# Intentionally do not include SWIGTYPE_p_void.java below so that the
# Java compiler uses the one created in package
@@ -82,8 +80,6 @@ $(wrappedjar_DATA): $(classes)
$(JAR) cfm $@ MANIFEST.MF $^
install-data-hook:
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
$(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
--- a/libqpol/swig/java/Makefile.am
+++ b/libqpol/swig/java/Makefile.am
@@ -1,4 +1,4 @@
-wrappedso_DATA = libjqpol.so.@libqpol_version@
+wrappedso_DATA = libjqpol.so
wrappedso_SONAME = @libqpol_jswig_soname@
short_name = libjqpol.so
wrappedsodir = $(libdir)
@@ -64,9 +64,7 @@ $(firstword $(BUILT_SOURCES)): $(dist_no
$(wordlist 2,$(words $(BUILT_SOURCES)), $(BUILT_SOURCES)): $(firstword $(BUILT_SOURCES))
$(wrappedso_DATA): $(filter %.c, $(BUILT_SOURCES))
- $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -Wl,-soname,$(wrappedso_SONAME)
- $(LN_S) -f $@ $(wrappedso_SONAME)
- $(LN_S) -f $@ $(short_name)
+ $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
classes = $(patsubst %.java,$(package_dir)/%.class,$(filter %.java, $(BUILT_SOURCES)))
@@ -86,8 +84,6 @@ $(wrappedjar_DATA): $(classes)
$(JAR) cfm $@ MANIFEST.MF $^
install-data-hook:
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
$(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
--- a/libseaudit/swig/java/Makefile.am
+++ b/libseaudit/swig/java/Makefile.am
@@ -1,4 +1,4 @@
-wrappedso_DATA = libjseaudit.so.@libseaudit_version@
+wrappedso_DATA = libjseaudit.so
wrappedso_SONAME = @libseaudit_jswig_soname@
short_name = libjseaudit.so
wrappedsodir = $(libdir)
@@ -51,9 +51,7 @@ $(firstword $(BUILT_SOURCES)): $(dist_no
$(wordlist 2,$(words $(BUILT_SOURCES)), $(BUILT_SOURCES)): $(firstword $(BUILT_SOURCES))
$(wrappedso_DATA): $(filter %.c, $(BUILT_SOURCES))
- $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS) -Wl,-soname,$(wrappedso_SONAME)
- $(LN_S) -f $@ $(wrappedso_SONAME)
- $(LN_S) -f $@ $(short_name)
+ $(CC) -shared -o $@ $^ $(AM_CFLAGS) $(CFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS)
# Intentionally do not include SWIGTYPE_p_void.java below so that the
# Java compiler uses the one created in package
@@ -79,8 +77,6 @@ $(wrappedjar_DATA): $(classes)
$(JAR) cfm $@ MANIFEST.MF $^
install-data-hook:
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
$(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
--- a/libsefs/swig/java/Makefile.am
+++ b/libsefs/swig/java/Makefile.am
@@ -1,4 +1,4 @@
-wrappedso_DATA = libjsefs.so.@libsefs_version@
+wrappedso_DATA = libjsefs.so
wrappedso_SONAME = @libsefs_jswig_soname@
short_name = libjsefs.so
wrappedsodir = $(libdir)
@@ -46,9 +46,7 @@ $(firstword $(BUILT_SOURCES)): $(dist_no
$(wordlist 2,$(words $(BUILT_SOURCES)), $(BUILT_SOURCES)): $(firstword $(BUILT_SOURCES))
$(wrappedso_DATA): $(filter %.cc, $(BUILT_SOURCES))
- $(CXX) -shared -o $@ $^ $(AM_CXXFLAGS) $(CXXFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS) -Wl,-soname,$(wrappedso_SONAME)
- $(LN_S) -f $@ $(wrappedso_SONAME)
- $(LN_S) -f $@ $(short_name)
+ $(CXX) -shared -o $@ $^ $(AM_CXXFLAGS) $(CXXFLAGS) $(SWIG_JAVA_CFLAGS) -DSWIGJAVA=1 $(AM_LDFLAGS) $(LDFLAGS)
# Intentionally do not include SWIGTYPE_p_void.java below so that the
# Java compiler uses the one created in package
@@ -74,8 +72,6 @@ $(wrappedjar_DATA): $(classes)
$(JAR) cfm $@ MANIFEST.MF $^
install-data-hook:
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(wrappedso_SONAME)
- cd $(DESTDIR)$(wrappedsodir) && $(LN_S) -f $(wrappedso_DATA) $(short_name)
$(mkdir_p) $(DESTDIR)$(javadir) && cd $(DESTDIR)$(javadir) && $(LN_S) -f $(wrappedjardir)/$(wrappedjar_DATA)
uninstall-local:
|