blob: 7e921dfb3c1f85501611c03871d3081555f972cd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
$NetBSD: patch-ac,v 1.3 2004/07/20 23:53:12 salo Exp $
--- make/linux/Makefile.orig 2004-01-05 12:28:43.000000000 +0100
+++ make/linux/Makefile 2004-07-21 00:21:56.000000000 +0200
@@ -15,13 +15,13 @@
includedir=$(prefix)/include/matroska
# Programs
-CXX=g++
-LD=g++
+#CXX=g++
+LD=$(CXX)
DEP=$(CXX) -MM
DEPEND = makedepend
-AR = ar rcvu
-RANLIB = ranlib
-INSTALL = install
+AR += rcvu
+#RANLIB = ranlib
+INSTALL = $(BSD_INSTALL)
INSTALL_OPTS = -m 644
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
@@ -36,8 +36,8 @@
ifeq (yes,$(DEBUG))
DEBUGFLAGS=-g -DDEBUG
endif
-CXXFLAGS=$(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE -Wshadow
-LDFLAGS=-L. -L$(LIBEBML_LIB_DIR)
+CXXFLAGS+= $(DEBUGFLAGS) -Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE -Wshadow
+LDFLAGS+= -L. -L$(LIBEBML_LIB_DIR)
SRC_DIR=$(CWD)/../../src/
INCLUDE_DIR=$(CWD)/../../matroska
@@ -66,7 +66,7 @@
DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
-all: $(LIBRARY) test
+all: $(LIBRARY)
lib library: $(LIBRARY)
|
