Drop -1.8 prefix at various places

This was introduced in e82c6bd ("Update to upnp-1.8") to make it possible to install development files for both libupnp 1.6 and libupnp 1.8. However having that suffix is a burden to programs linking against libupnp. vlc developer Jean-Baptiste Kempf refused to update vlc to use libupnp-1.8 with the suffix[1]. I didn't touch the library versions (LT_VERSION_*). There is no conflict with the 1.6 branch so keeping the numbers should be ok. [1] https://bugs.debian.org/868936#42
mrjimenez · Aug 3, 2017 · 07f504c · 07f504c
1 parent aaf757d
commit 07f504c
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 65 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -16,7 +16,7 @@ SUBDIRS = \
 
 EXTRA_DIST = \
 	Doxyfile \
-	libupnp-1.8.pc.in \
+	libupnp.pc.in \
 	LICENSE \
 	THANKS \
 	libupnp.spec \
@@ -29,7 +29,7 @@ EXTRA_DIST = \
 # This variable must have 'exec' in its name, in order to be installed 
 # by 'install-exec' target (instead of default 'install-data')
 pkgconfigexecdir = $(libdir)/pkgconfig
-pkgconfigexec_DATA = libupnp-1.8.pc
+pkgconfigexec_DATA = libupnp.pc
 
 
 $(pkgconfigexec_DATA): config.status

diff --git a/build/vc10/libupnp.sln b/build/vc10/libupnp.sln
@@ -22,7 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\..\COPYING = ..\..\COPYING
 		..\..\Doxyfile = ..\..\Doxyfile
 		..\..\INSTALL = ..\..\INSTALL
-		..\..\libupnp-1.8.pc.in = ..\..\libupnp-1.8.pc.in
+		..\..\libupnp.pc.in = ..\..\libupnp.pc.in
 		..\..\libupnp.spec = ..\..\libupnp.spec
 		..\..\LICENSE = ..\..\LICENSE
 		..\..\Makefile.am = ..\..\Makefile.am

diff --git a/configure.ac b/configure.ac
@@ -735,7 +735,7 @@ AC_CONFIG_FILES([
 	upnp/sample/Makefile
 	upnp/unittest/Makefile
 	docs/dist/Makefile
-	libupnp-1.8.pc
+	libupnp.pc
 	])
 
 

diff --git a/ixml/Makefile.am b/ixml/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
                           -I$(top_srcdir)/upnp/inc
 AM_CFLAGS		= 
 
-LDADD			= libixml-1.8.la
+LDADD			= libixml.la
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG
@@ -23,12 +23,12 @@ if ENABLE_SCRIPTSUPPORT
     AM_CPPFLAGS		+= -DIXML_HAVE_SCRIPTSUPPORT
 endif
 
-lib_LTLIBRARIES		= libixml-1.8.la
+lib_LTLIBRARIES		= libixml.la
 
-libixml_1_8_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
+libixml_la_LDFLAGS	= -version-info $(LT_VERSION_IXML) \
 			  -export-symbols-regex '^ixml.*'
 
-libixml_1_8_la_SOURCES	= \
+libixml_la_SOURCES	= \
 			src/attr.c \
 			src/document.c \
 			src/element.c \
@@ -42,15 +42,15 @@ libixml_1_8_la_SOURCES	= \
 			src/node.c \
 			src/nodeList.c
 
-upnpincludedir		= $(includedir)/upnp-1.8
+upnpincludedir		= $(includedir)/upnp
 upnpinclude_HEADERS	= \
 			inc/ixml.h \
 			inc/ixmldebug.h
 
-check_PROGRAMS          = test_document-1.8
+check_PROGRAMS          = test_document
 TESTS                   = test/test_document.sh
 
-test_document_1_8_SOURCES 	= test/test_document.c
+test_document_SOURCES 	= test/test_document.c
 
 EXTRA_DIST		= test/test_document.sh test/testdata
 

diff --git a/libupnp-1.8.pc.in → libupnp.pc.in b/libupnp-1.8.pc.in → libupnp.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libupnp-1.8
+Name: libupnp
 Description: Linux SDK for UPnP Devices
 Version: @VERSION@
-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp-1.8 -lixml-1.8
-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp-1.8
+Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml
+Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
 
diff --git a/libupnp.spec b/libupnp.spec
@@ -48,7 +48,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{__mv} %{buildroot}%{docdir}/html \
 	%{buildroot}%{docdeveldir}/
 
-%{__rm} %{buildroot}%{_libdir}/{libixml-1.8.la,libupnp-1.8.la}
+%{__rm} %{buildroot}%{_libdir}/{libixml.la,libupnp.la}
 
 %post -p /sbin/ldconfig
 
@@ -57,18 +57,18 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc %{docdir}
-%{_libdir}/libixml-1.8.so.*
-%{_libdir}/libupnp-1.8.so.*
+%{_libdir}/libixml.so.*
+%{_libdir}/libupnp.so.*
 
 %files devel
 %defattr(0644,root,root,0755)
 %doc %{docdeveldir}
-%{_includedir}/upnp-1.8/
-%{_libdir}/libixml-1.8.so
-%{_libdir}/libupnp-1.8.so
-%{_libdir}/libixml-1.8.a
-%{_libdir}/libupnp-1.8.a
-%{_libdir}/pkgconfig/libupnp-1.8.pc
+%{_includedir}/upnp/
+%{_libdir}/libixml.so
+%{_libdir}/libupnp.so
+%{_libdir}/libixml.a
+%{_libdir}/libupnp.a
+%{_libdir}/pkgconfig/libupnp.pc
 
 %clean
 rm -rf %{buildroot}

diff --git a/upnp/Makefile.am b/upnp/Makefile.am
@@ -11,11 +11,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/ixml/inc
 
 LDADD = \
-	libupnp-1.8.la \
-	$(top_builddir)/ixml/libixml-1.8.la
+	libupnp.la \
+	$(top_builddir)/ixml/libixml.la
 
 
-upnpincludedir = $(includedir)/upnp-1.8
+upnpincludedir = $(includedir)/upnp
 upnpinclude_HEADERS = \
 	inc/ActionComplete.h \
 	inc/ActionRequest.h \
@@ -47,16 +47,16 @@ upnpinclude_HEADERS += inc/upnptools.h
 endif
 
 
-lib_LTLIBRARIES = libupnp-1.8.la
+lib_LTLIBRARIES = libupnp.la
 
-libupnp_1_8_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
+libupnp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/src/inc 
 
-libupnp_1_8_la_LDFLAGS = \
+libupnp_la_LDFLAGS = \
 	-version-info $(LT_VERSION_UPNP) \
 	-export-symbols-regex '^Upnp.*' \
-	$(top_builddir)/ixml/libixml-1.8.la
+	$(top_builddir)/ixml/libixml.la
 
-libupnp_1_8_la_SOURCES = \
+libupnp_la_SOURCES = \
 	src/inc/config.h \
 	src/inc/client_table.h \
 	src/inc/ClientSubscription.h \
@@ -95,8 +95,8 @@ libupnp_1_8_la_SOURCES = \
 upnpinclude_HEADERS += \
 	inc/ithread.h
 
-libupnp_1_8_la_CPPFLAGS += -I$(srcdir)/src/threadutil
-libupnp_1_8_la_SOURCES += \
+libupnp_la_CPPFLAGS += -I$(srcdir)/src/threadutil
+libupnp_la_SOURCES += \
 	src/threadutil/FreeList.h \
 	src/threadutil/FreeList.c \
 	src/threadutil/LinkedList.h \
@@ -108,7 +108,7 @@ libupnp_1_8_la_SOURCES += \
 
 # ssdp
 if ENABLE_SSDP
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/ssdp/ssdp_ResultData.c \
 	src/ssdp/ssdp_ResultData.h \
 	src/ssdp/ssdp_device.c \
@@ -118,14 +118,14 @@ endif
 
 # soap
 if ENABLE_SOAP
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/soap/soap_device.c \
 	src/soap/soap_ctrlpt.c \
 	src/soap/soap_common.c
 endif
 
 # genlib
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/genlib/miniserver/miniserver.c \
 	src/genlib/client_table/client_table.c \
 	src/genlib/client_table/ClientSubscription.c \
@@ -144,14 +144,14 @@ libupnp_1_8_la_SOURCES += \
 
 # gena
 if ENABLE_GENA
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/gena/gena_device.c \
 	src/gena/gena_ctrlpt.c \
 	src/gena/gena_callback2.c
 endif
 
 # api
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/api/ActionComplete.c \
 	src/api/ActionRequest.c \
 	src/api/Discovery.c \
@@ -165,11 +165,11 @@ libupnp_1_8_la_SOURCES += \
 	src/api/upnpapi.c
 
 if ENABLE_TOOLS
-libupnp_1_8_la_SOURCES += src/api/upnptools.c
+libupnp_la_SOURCES += src/api/upnptools.c
 endif
 
 if ENABLE_DEBUG
-libupnp_1_8_la_SOURCES += src/api/upnpdebug.c 
+libupnp_la_SOURCES += src/api/upnpdebug.c 
 AM_CPPFLAGS         += -DDEBUG -DSTATS
 else
 AM_CPPFLAGS         += -DNDEBUG
@@ -178,28 +178,28 @@ endif
 
 # uuid
 if ENABLE_UUID
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/uuid/md5.c \
 	src/uuid/sysdep.c \
 	src/uuid/uuid.c
 endif
 
 
 # urlconfig
-libupnp_1_8_la_SOURCES += src/urlconfig/urlconfig.c
+libupnp_la_SOURCES += src/urlconfig/urlconfig.c
 
 
 # inet_pton (needed on Win32, compiles to nothing elsewhere)
-libupnp_1_8_la_SOURCES += \
+libupnp_la_SOURCES += \
 	src/inet_pton.c \
 	src/inc/inet_pton.h
 
 
 # check / distcheck tests
-check_PROGRAMS = test_init-1.8 test_url-1.8
-TESTS = test_init-1.8 test_url-1.8
-test_init_1_8_SOURCES = test/test_init.c
-test_url_1_8_SOURCES = test/test_url.c
+check_PROGRAMS = test_init test_url
+TESTS = test_init test_url
+test_init_SOURCES = test/test_init.c
+test_url_SOURCES = test/test_url.c
 
 
 EXTRA_DIST = \

diff --git a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am
@@ -9,49 +9,49 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/ixml/inc
 
 LDADD = \
-	$(top_builddir)/upnp/libupnp-1.8.la \
-	$(top_builddir)/ixml/libixml-1.8.la
+	$(top_builddir)/upnp/libupnp.la \
+	$(top_builddir)/ixml/libixml.la
 
 # samples
 noinst_PROGRAMS =
 if ENABLE_SAMPLES
 if ENABLE_CLIENT
-noinst_PROGRAMS += tv_ctrlpt-1.8
-tv_ctrlpt_1_8_CPPFLAGS = \
+noinst_PROGRAMS += tv_ctrlpt
+tv_ctrlpt_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvctrlpt
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_combo-1.8
-tv_combo_1_8_CPPFLAGS = $(AM_CPPFLAGS) \
+noinst_PROGRAMS += tv_combo
+tv_combo_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvcombo
 endif
 endif
 if ENABLE_DEVICE
-noinst_PROGRAMS += tv_device-1.8
-tv_device_1_8_CPPFLAGS = \
+noinst_PROGRAMS += tv_device
+tv_device_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(srcdir)/common/ \
 	-I$(srcdir)/tvdevice
 endif
 endif
 
-tv_device_1_8_SOURCES = \
+tv_device_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
 	common/tv_device.c \
 	common/tv_device.h \
 	linux/tv_device_main.c
 
-tv_ctrlpt_1_8_SOURCES = \
+tv_ctrlpt_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
 	common/tv_ctrlpt.c \
 	common/tv_ctrlpt.h \
 	linux/tv_ctrlpt_main.c
 
-tv_combo_1_8_SOURCES = \
+tv_combo_SOURCES = \
 	common/sample_util.c \
 	common/sample_util.h \
 	common/tv_ctrlpt.c \
@@ -63,8 +63,8 @@ tv_combo_1_8_SOURCES = \
 if WITH_DOCUMENTATION
 examplesdir = $(docdir)/examples
 examples_DATA = \
-	$(tv_ctrlpt_1_8_SOURCES) \
-	$(tv_device_1_8_SOURCES)
+	$(tv_ctrlpt_SOURCES) \
+	$(tv_device_SOURCES)
 endif
 
 EXTRA_DIST = \

diff --git a/upnp/unittest/Makefile.am b/upnp/unittest/Makefile.am
@@ -10,16 +10,16 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/upnp/src/inc
 
 LDADD = \
-	$(top_builddir)/upnp/libupnp-1.8.la \
-	$(top_builddir)/ixml/libixml-1.8.la
+	$(top_builddir)/upnp/libupnp.la \
+	$(top_builddir)/ixml/libixml.la
 
 #unittest
-noinst_PROGRAMS = unittest-1.8
+noinst_PROGRAMS = unittest
 
-unittest_1_8_CPPFLAGS = \
+unittest_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
-unittest_1_8_SOURCES = \
+unittest_SOURCES = \
 	main.c \
 	templates/FirstObject.c \
 	templates/FirstObject.h \