58 lines
1.6 KiB
Plaintext
58 lines
1.6 KiB
Plaintext
$OpenBSD: patch-make_linux_Makefile,v 1.2 2007/03/21 12:00:29 ajacoutot Exp $
|
|
--- make/linux/Makefile.orig Mon Mar 19 13:40:09 2007
|
|
+++ make/linux/Makefile Mon Mar 19 13:42:43 2007
|
|
@@ -16,11 +16,11 @@ prefix=/boot/home/config
|
|
else
|
|
prefix=/usr/local
|
|
endif
|
|
-libdir=$(prefix)/lib
|
|
-includedir=$(prefix)/include/matroska
|
|
+libdir=$(PREFIX)/lib
|
|
+includedir=$(PREFIX)/include/matroska
|
|
|
|
# Programs
|
|
-CXX=g++
|
|
+#CXX=g++
|
|
LD=$(CXX)
|
|
AR = ar rcvu
|
|
RANLIB = ranlib
|
|
@@ -36,8 +36,8 @@ endif
|
|
CWD=$(shell pwd)
|
|
|
|
# Options
|
|
-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
|
|
-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
|
|
+LIBEBML_INCLUDE_DIR=$(LOCALBASE)/include
|
|
+LIBEBML_LIB_DIR=$(LOCALBASE)/lib
|
|
EXTENSION=.cpp
|
|
|
|
ifeq (yes,$(DEBUG))
|
|
@@ -57,7 +57,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
|
|
# Names
|
|
LIBRARY=libmatroska.a
|
|
LIBRARY_SO=libmatroska.so
|
|
-LIBRARY_SO_VER=libmatroska.so.0
|
|
+LIBRARY_SO_VER=libmatroska.so.$(LIBmatroska_VERSION)
|
|
|
|
# source-files
|
|
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
|
@@ -102,9 +102,7 @@ $(LIBRARY): $(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)
|
|
+ $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) $(LINKFLAGS) -lebml
|
|
|
|
clean: cleantest
|
|
rm -f $(objects) $(objects_so)
|
|
@@ -172,7 +170,6 @@ install_staticlib: $(LIBRARY)
|
|
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)
|
|
|
|
ifneq ($(wildcard .depend),)
|
|
include .depend
|