4ba591dec7
changes: several new elements that were added to the Matroska specifications: CueDuration, CueRelativePosition, ChapterStringUID, VideoAlphaMode and DefaultDecodedFieldDuration
87 lines
2.6 KiB
Text
87 lines
2.6 KiB
Text
$NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $
|
|
|
|
--- make/linux/Makefile.orig 2013-03-21 12:11:24.000000000 +0000
|
|
+++ make/linux/Makefile
|
|
@@ -16,16 +16,16 @@ prefix=/boot/home/config
|
|
else
|
|
prefix=/usr/local
|
|
endif
|
|
-libdir=$(prefix)/lib
|
|
-includedir=$(prefix)/include/matroska
|
|
+libdir=$(PREFIX)/lib
|
|
+includedir=$(PREFIX)/include/matroska
|
|
|
|
# Programs
|
|
CROSS =
|
|
-CXX = $(CROSS)g++
|
|
+#CXX = $(CROSS)g++
|
|
LD = $(CXX)
|
|
-AR = $(CROSS)ar
|
|
-RANLIB = $(CROSS)ranlib
|
|
-INSTALL = install
|
|
+#AR = $(CROSS)ar
|
|
+#RANLIB = $(CROSS)ranlib
|
|
+INSTALL = $(BSD_INSTALL)
|
|
INSTALL_OPTS = -m 644
|
|
INSTALL_OPTS_LIB = -m 644
|
|
INSTALL_DIR_OPTS = -m 755
|
|
@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
|
|
|
|
# Names
|
|
LIBRARY=libmatroska.a
|
|
-LIBRARY_SO=libmatroska.so
|
|
+LIBRARY_SO=libmatroska.la
|
|
LIBRARY_SO_VER=libmatroska.so.6
|
|
|
|
# source-files
|
|
@@ -92,16 +92,14 @@ lib:
|
|
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
|
|
|
%.lo: %$(EXTENSION)
|
|
- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
|
|
+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
|
|
|
$(LIBRARY): $(objects)
|
|
$(AR) rcvu $@ $(objects)
|
|
$(RANLIB) $@
|
|
|
|
$(LIBRARY_SO): $(objects_so)
|
|
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
|
|
- rm -f $(LIBRARY_SO)
|
|
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
|
|
+ $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
|
|
|
|
clean: cleantest
|
|
rm -f $(objects) $(objects_so)
|
|
@@ -153,23 +151,22 @@ install: install_staticlib install_share
|
|
endif
|
|
|
|
install_headers:
|
|
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
|
|
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
|
|
for i in $(INCLUDE_DIR)/*.h; do \
|
|
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
|
|
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
|
|
done
|
|
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
|
|
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
|
|
for i in $(INCLUDE_DIR)/c/*.h; do \
|
|
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
|
|
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
|
|
done
|
|
|
|
install_staticlib: $(LIBRARY)
|
|
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
|
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
|
|
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
|
+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
|
|
|
|
install_sharedlib: $(LIBRARY_SO)
|
|
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
|
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
|
|
- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
|
|
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
|
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
|
|
|
|
ifneq ($(wildcard .depend),)
|
|
include .depend
|