[matroska] r1140 - in tags/libebml/libebml-0.7.4: . debian make/linux

Author: mosu
Date: 2005-04-16 15:19:57 +0400 (Sat, 16 Apr 2005)
New Revision: 1140

Modified:
   tags/libebml/libebml-0.7.4/ChangeLog
   tags/libebml/libebml-0.7.4/debian/rules
   tags/libebml/libebml-0.7.4/make/linux/Makefile
Log:
Merged revisions 1137:1139 from libebml trunk.

Modified: tags/libebml/libebml-0.7.4/ChangeLog
===================================================================
--- tags/libebml/libebml-0.7.4/ChangeLog	2005-04-16 11:18:26 UTC (rev 1139)
+++ tags/libebml/libebml-0.7.4/ChangeLog	2005-04-16 11:19:57 UTC (rev 1140)
@@ -1,3 +1,19 @@
+2005-04-16 11:17  mosu
+
+	* trunk/libebml/debian/rules, trunk/libebml/make/linux/Makefile:
+	  Updated the Linux build system and added targets for installing
+	  only the static lib + headers. Updated the Debian package build
+	  script for that, too.
+
+2005-04-16 11:09  mosu
+
+	* trunk/libebml/debian/changelog: Updated the Debian packet's
+	  version number.
+
+2005-04-16 11:09  mosu
+
+	* trunk/libebml/ChangeLog: Automatic ChangeLog update.
+
 2005-04-14 15:19  mosu
 
 	* trunk/libebml/ebml/EbmlConfig.h, trunk/libebml/ebml/EbmlCrc32.h:

Modified: tags/libebml/libebml-0.7.4/debian/rules
===================================================================
--- tags/libebml/libebml-0.7.4/debian/rules	2005-04-16 11:18:26 UTC (rev 1139)
+++ tags/libebml/libebml-0.7.4/debian/rules	2005-04-16 11:19:57 UTC (rev 1140)
@@ -30,7 +30,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE) $(DEB_BUILD_OPTIONS) -C make/linux
+	$(MAKE) $(DEB_BUILD_OPTIONS) -C make/linux staticlib
 
 	touch build-stamp
 
@@ -51,7 +51,9 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	$(MAKE) $(DEB_BUILD_OPTIONS) -C make/linux prefix=$(CURDIR)/debian/tmp/usr install
+	$(MAKE) $(DEB_BUILD_OPTIONS) \
+		-C make/linux prefix=$(CURDIR)/debian/tmp/usr \
+		install_staticlib install_headers
 
 
 # Build architecture-independent files here.

Modified: tags/libebml/libebml-0.7.4/make/linux/Makefile
===================================================================
--- tags/libebml/libebml-0.7.4/make/linux/Makefile	2005-04-16 11:18:26 UTC (rev 1139)
+++ tags/libebml/libebml-0.7.4/make/linux/Makefile	2005-04-16 11:19:57 UTC (rev 1140)
@@ -113,11 +113,9 @@
 		$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
 	done
 
-install: $(LIBRARY) $(LIBRARY_SO)
-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
-	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+install: install_staticlib install_sharedlib install_headers
+
+install_headers:
 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
 	for i in $(INCLUDE_DIR)/*.h; do \
 		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
@@ -127,6 +125,15 @@
 		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
 	done
 
+install_staticlib: $(LIBRARY)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+
+install_sharedlib: $(LIBRARY_SO)
+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
+	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif