[SCM] liblivemedia/master: Add an install target to the build system and use it.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Tue Dec 18 01:34:30 UTC 2012 

The following commit has been merged in the master branch:
commit 89fe2b9ae1ce2995ea040d6f131973fa02f067f3
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Dec 18 01:00:28 2012 +0100

    Add an install target to the build system and use it.

diff --git a/debian/liblivemedia-dev.dirs b/debian/liblivemedia-dev.install
similarity index 100%
rename from debian/liblivemedia-dev.dirs
rename to debian/liblivemedia-dev.install
index 4418816..da07fdd 100644
--- a/debian/liblivemedia-dev.dirs
+++ b/debian/liblivemedia-dev.install
@@ -1,2 +1,2 @@
-usr/lib
 usr/include
+usr/lib
diff --git a/debian/livemedia-utils.dirs b/debian/livemedia-utils.dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/livemedia-utils.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/livemedia-utils.install b/debian/livemedia-utils.install
new file mode 100644
index 0000000..06869ef
--- /dev/null
+++ b/debian/livemedia-utils.install
@@ -0,0 +1,2 @@
+debian/openRTSP.html usr/share/doc/livemedia-utils
+usr/bin
diff --git a/debian/patches/install-target.patch b/debian/patches/install-target.patch
new file mode 100644
index 0000000..6510dba
--- /dev/null
+++ b/debian/patches/install-target.patch
@@ -0,0 +1,167 @@
+Description: Add an install target to the build system.
+Author: Benjamin Drung <bdrung at debian.org>
+
+--- a/Makefile.tail
++++ b/Makefile.tail
+@@ -28,3 +28,12 @@
+ 	cd $(TESTPROGS_DIR) ; $(MAKE) clean
+ 	cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean
+ 	cd $(PROXY_SERVER_DIR) ; $(MAKE) clean
++
++install:
++	cd $(LIVEMEDIA_DIR) ; $(MAKE) install
++	cd $(GROUPSOCK_DIR) ; $(MAKE) install
++	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
++	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
++	cd $(TESTPROGS_DIR) ; $(MAKE) install
++	cd $(MEDIA_SERVER_DIR) ; $(MAKE) install
++	cd $(PROXY_SERVER_DIR) ; $(MAKE) install
+--- a/BasicUsageEnvironment/Makefile.tail
++++ b/BasicUsageEnvironment/Makefile.tail
+@@ -3,6 +3,10 @@
+ NAME = libBasicUsageEnvironment
+ LIB = $(NAME).$(LIB_SUFFIX)
+ ALL = $(LIB)
++
++PREFIX ?= /usr/local
++LIBDIR ?= $(PREFIX)/lib
++
+ all:	$(ALL)
+ 
+ OBJS = BasicUsageEnvironment0.$(OBJ) BasicUsageEnvironment.$(OBJ) \
+@@ -31,4 +35,9 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: libBasicUsageEnvironment.$(LIB_SUFFIX)
++	install -d $(DESTDIR)$(PREFIX)/include/BasicUsageEnvironment $(DESTDIR)$(LIBDIR)
++	install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/BasicUsageEnvironment
++	install -m 644 libBasicUsageEnvironment.$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)
++
+ ##### Any additional, platform-specific rules come here:
+--- a/groupsock/Makefile.tail
++++ b/groupsock/Makefile.tail
+@@ -2,6 +2,10 @@
+ 
+ NAME = libgroupsock
+ ALL = $(NAME).$(LIB_SUFFIX)
++
++PREFIX ?= /usr/local
++LIBDIR ?= $(PREFIX)/lib
++
+ all:	$(ALL)
+ 
+ .$(C).$(OBJ):
+@@ -34,4 +38,9 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: libgroupsock.$(LIB_SUFFIX)
++	install -d $(DESTDIR)$(PREFIX)/include/groupsock $(DESTDIR)$(LIBDIR)
++	install -m 644 include/*.hh include/*.h $(DESTDIR)$(PREFIX)/include/groupsock
++	install -m 644 libgroupsock.$(LIB_SUFFIX) $(DESTDIR)$(LIBDIR)
++
+ ##### Any additional, platform-specific rules come here:
+--- a/UsageEnvironment/Makefile.tail
++++ b/UsageEnvironment/Makefile.tail
+@@ -3,6 +3,10 @@
+ NAME = libUsageEnvironment
+ USAGE_ENVIRONMENT_LIB = $(NAME).$(LIB_SUFFIX)
+ ALL = $(USAGE_ENVIRONMENT_LIB)
++
++PREFIX ?= /usr/local
++LIBDIR ?= $(PREFIX)/lib
++
+ all:	$(ALL)
+ 
+ OBJS = UsageEnvironment.$(OBJ) HashTable.$(OBJ) strDup.$(OBJ)
+@@ -25,4 +29,9 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: $(USAGE_ENVIRONMENT_LIB)
++	install -d $(DESTDIR)$(PREFIX)/include/UsageEnvironment $(DESTDIR)$(LIBDIR)
++	install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/UsageEnvironment
++	install -m 644 $(USAGE_ENVIRONMENT_LIB) $(DESTDIR)$(LIBDIR)
++
+ ##### Any additional, platform-specific rules come here:
+--- a/liveMedia/Makefile.tail
++++ b/liveMedia/Makefile.tail
+@@ -3,6 +3,10 @@
+ NAME = libliveMedia
+ LIVEMEDIA_LIB = $(NAME).$(LIB_SUFFIX)
+ ALL = $(LIVEMEDIA_LIB)
++
++PREFIX ?= /usr/local
++LIBDIR ?= $(PREFIX)/lib
++
+ all:	$(ALL)
+ 
+ .$(C).$(OBJ):
+@@ -354,4 +358,9 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: $(LIVEMEDIA_LIB)
++	install -d $(DESTDIR)$(PREFIX)/include/liveMedia $(DESTDIR)$(LIBDIR)
++	install -m 644 include/*.hh $(DESTDIR)$(PREFIX)/include/liveMedia
++	install -m 644 $(LIVEMEDIA_LIB) $(DESTDIR)$(LIBDIR)
++
+ ##### Any additional, platform-specific rules come here:
+--- a/testProgs/Makefile.tail
++++ b/testProgs/Makefile.tail
+@@ -12,6 +12,9 @@
+ MISC_APPS = testMPEG1or2Splitter$(EXE) testMPEG1or2ProgramToTransportStream$(EXE) testH264VideoToTransportStream$(EXE) MPEG2TransportStreamIndexer$(EXE) testMPEG2TransportStreamTrickPlay$(EXE)
+ 
+ ALL = $(MULTICAST_APPS) $(UNICAST_APPS) $(MISC_APPS)
++
++PREFIX ?= /usr/local
++
+ all: $(ALL)
+ 
+ extra:	testGSMStreamer$(EXE)
+@@ -129,4 +132,8 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: $(ALL)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 755 $(ALL) $(DESTDIR)$(PREFIX)/bin
++
+ ##### Any additional, platform-specific rules come here:
+--- a/mediaServer/Makefile.tail
++++ b/mediaServer/Makefile.tail
+@@ -1,5 +1,6 @@
+ ##### End of variables to change
+ 
++PREFIX ?= /usr/local
+ MEDIA_SERVER = live555MediaServer$(EXE)
+ 
+ ALL = $(MEDIA_SERVER)
+@@ -34,4 +35,8 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: $(MEDIA_SERVER)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 755 $(MEDIA_SERVER) $(DESTDIR)$(PREFIX)/bin
++
+ ##### Any additional, platform-specific rules come here:
+--- a/proxyServer/Makefile.tail
++++ b/proxyServer/Makefile.tail
+@@ -1,5 +1,6 @@
+ ##### End of variables to change
+ 
++PREFIX ?= /usr/local
+ PROXY_SERVER = live555ProxyServer$(EXE)
+ 
+ ALL = $(PROXY_SERVER)
+@@ -31,4 +32,8 @@
+ clean:
+ 	-rm -rf *.$(OBJ) $(ALL) core *.core *~ include/*~
+ 
++install: $(PROXY_SERVER)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 755 $(PROXY_SERVER) $(DESTDIR)$(PREFIX)/bin
++
+ ##### Any additional, platform-specific rules come here:
diff --git a/debian/patches/series b/debian/patches/series
index 8fda19e..6b9c576 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 021_ip_mreq_source.diff
 022_synchronous_rtspclient.patch
 301_hardening.patch
+install-target.patch
diff --git a/debian/rules b/debian/rules
index 2f0fb36..1e7d98b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CFLAGS += -Wall
 
@@ -42,29 +43,11 @@ override_dh_auto_build:
 	$(MAKE) clean
 	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE)
 
-override_dh_install:
-	for f in BasicUsageEnvironment \
-	            UsageEnvironment liveMedia groupsock; do \
-	  dh_install -pliblivemedia-dev "$${f}/include/"*.h* "usr/include/$${f}"; \
-	  dh_install -pliblivemedia-dev "$${f}/lib$${f}.a" "usr/lib"; \
-	  dh_install -pliblivemedia-dev "$${f}/lib$${f}_pic.a" "usr/lib"; \
-	done
-	dh_install -plivemedia-utils mediaServer/live555MediaServer /usr/bin
-	dh_install -plivemedia-utils proxyServer/live555ProxyServer /usr/bin
-	for f in openRTSP playSIP sapWatch testAMRAudioStreamer \
-	          testMP3Receiver testMP3Streamer \
-	          testMPEG1or2AudioVideoStreamer \
-	          testMPEG1or2AudioVideoToDarwin \
-	          testMPEG1or2ProgramToTransportStream \
-	          testMPEG1or2Splitter testMPEG1or2VideoReceiver \
-	          testMPEG1or2VideoStreamer testMPEG2TransportStreamer \
-	          testMPEG4VideoStreamer testMPEG4VideoToDarwin \
-	          testOnDemandRTSPServer testRelay testWAVAudioStreamer \
-		  MPEG2TransportStreamIndexer \
-	          vobStreamer; do \
-	  dh_install -plivemedia-utils "testProgs/$${f}" "usr/bin"; \
+override_dh_auto_install:
+	dh_auto_install -- PREFIX=/usr LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do \
+	  install -m 644 $${f}/lib$${f}_pic.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH); \
 	done
-	dh_install -plivemedia-utils debian/openRTSP.html usr/share/doc/livemedia-utils
 
 override_dh_installchangelogs:
 	dh_installchangelogs debian/upstream.changelog

-- 
liblivemedia packaging

More information about the pkg-multimedia-commits mailing list