[matroska] r1138 - in trunk/libebml: debian make/linux

[email protected]
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]>
Author: mosu
Date: 2005-04-16 15:17:56 +0400 (Sat, 16 Apr 2005)
New Revision: 1138

Modified:
   trunk/libebml/debian/rules
   trunk/libebml/make/linux/Makefile
Log:
Updated the Linux build system and added targets for installing only the static lib + headers. Updated the Debian package build script for that, too.

Modified: trunk/libebml/debian/rules
===================================================================
--- trunk/libebml/debian/rules	2005-04-16 11:11:12 UTC (rev 1137)
+++ trunk/libebml/debian/rules	2005-04-16 11:17:56 UTC (rev 1138)
@@ -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: trunk/libebml/make/linux/Makefile
===================================================================
--- trunk/libebml/make/linux/Makefile	2005-04-16 11:11:12 UTC (rev 1137)
+++ trunk/libebml/make/linux/Makefile	2005-04-16 11:17:56 UTC (rev 1138)
@@ -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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.