Author: mosu
Date: 2005-04-16 15:29:02 +0400 (Sat, 16 Apr 2005)
New Revision: 1142
Modified:
trunk/libmatroska/debian/rules
trunk/libmatroska/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/libmatroska/debian/rules
===================================================================
--- trunk/libmatroska/debian/rules 2005-04-16 11:24:56 UTC (rev 1141)
+++ trunk/libmatroska/debian/rules 2005-04-16 11:29:02 UTC (rev 1142)
@@ -30,7 +30,7 @@
dh_testdir
# Add here commands to compile the package.
- $(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml lib
+ $(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml staticlib
touch build-stamp
@@ -51,7 +51,8 @@
dh_installdirs
# Add here commands to install the package into debian/tmp
- $(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr install
+ $(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr \
+ install_headers install_staticlib
# Build architecture-independent files here.
Modified: trunk/libmatroska/make/linux/Makefile
===================================================================
--- trunk/libmatroska/make/linux/Makefile 2005-04-16 11:24:56 UTC (rev 1141)
+++ trunk/libmatroska/make/linux/Makefile 2005-04-16 11:29:02 UTC (rev 1142)
@@ -144,11 +144,9 @@
test9.o: $(TAG_SRC_DIR)test9.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
-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) ; \
@@ -158,6 +156,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_DIR_OPTS) -d $(libdir)
+ $(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.