diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libdleyna/server/Makefile.am | 13 | ||||
| -rw-r--r-- | libdleyna/server/dleyna-server-1.0.pc.in | 11 | ||||
| -rw-r--r-- | server/dleyna-server-service-1.0.pc.in | 4 |
4 files changed, 7 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index cabdb58..355f516 100644 --- a/configure.ac +++ b/configure.ac @@ -226,7 +226,6 @@ AC_SUBST([with_log_type]) AC_CONFIG_FILES([Makefile \ libdleyna/server/Makefile \ - libdleyna/server/dleyna-server-1.0.pc \ libdleyna/server/dleyna-server-service.conf \ server/dleyna-server-service-1.0.pc \ server/Makefile \ diff --git a/libdleyna/server/Makefile.am b/libdleyna/server/Makefile.am index 9c5c26b..0c8a6d8 100644 --- a/libdleyna/server/Makefile.am +++ b/libdleyna/server/Makefile.am @@ -1,5 +1,3 @@ -libdleyna_serverincdir = $(includedir)/dleyna-1.0/libdleyna/server - DLEYNA_SERVER_VERSION = 1:3:0 AM_CFLAGS = $(GLIB_CFLAGS) \ @@ -16,7 +14,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} pkglib_LTLIBRARIES = libdleyna-server-1.0.la -libdleyna_serverinc_HEADERS = control-point-server.h +libdleyna_serverincdir = $(includedir)/dleyna-1.0/libdleyna/server + +libdleyna_serverinc_HEADERS = control-point-server.h libdleyna_server_1_0_la_LDFLAGS = -version-info $(DLEYNA_SERVER_VERSION) \ -no-undefined @@ -54,9 +54,6 @@ MAINTAINERCLEANFILES = Makefile.in \ sysconf_DATA = dleyna-server-service.conf -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dleyna-server-1.0.pc - EXTRA_DIST = $(sysconf_DATA) \ async.h \ client.h \ @@ -71,8 +68,8 @@ EXTRA_DIST = $(sysconf_DATA) \ task.h \ upnp.h -CLEANFILES = $(pkgconfig_DATA) dleyna-server-service.conf -DISTCLEANFILES = $(pkgconfig_DATA) dleyna-server-service.conf +CLEANFILES = dleyna-server-service.conf +DISTCLEANFILES = dleyna-server-service.conf maintainer-clean-local: rm -rf build-aux diff --git a/libdleyna/server/dleyna-server-1.0.pc.in b/libdleyna/server/dleyna-server-1.0.pc.in deleted file mode 100644 index c56881a..0000000 --- a/libdleyna/server/dleyna-server-1.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libexecdir=@libexecdir@ -includedir=${prefix}/include -libdir=@libdir@/@PACKAGE@ - -Name: @PACKAGE@ -Description: UPnP & DLNA server library -Libs: -L${libdir} -ldleyna-server-1.0 -Requires.private: glib-2.0 gio-2.0 gupnp-1.0 gupnp-av-1.0 dleyna-core-1.0 -Version: @VERSION@
\ No newline at end of file diff --git a/server/dleyna-server-service-1.0.pc.in b/server/dleyna-server-service-1.0.pc.in index d6e9af7..5ffd421 100644 --- a/server/dleyna-server-service-1.0.pc.in +++ b/server/dleyna-server-service-1.0.pc.in @@ -4,5 +4,5 @@ libexecdir=@libexecdir@ Name: @PACKAGE@-service Description: UPnP & DLNA media content management -Requires.private: glib-2.0 gio-2.0 dleyna-core-1.0 dleyna-server-1.0 -Version: @VERSION@
\ No newline at end of file +Requires.private: glib-2.0 gio-2.0 dleyna-core-1.0 +Version: @VERSION@ |