summaryrefslogtreecommitdiff
path: root/libsi
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-12-19 12:10:28 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-12-19 12:10:28 +0100
commit4132f5e7459b10df0faa9c36b632451e7f7d9afc (patch)
tree88a4d8bdacf5f19118dd769585f40efec4ea687e /libsi
parent8e54caa2057fb8d2c65da1273aa805ef4c80b5af (diff)
downloadvdr-4132f5e7459b10df0faa9c36b632451e7f7d9afc.tar.gz
vdr-4132f5e7459b10df0faa9c36b632451e7f7d9afc.tar.bz2
Removed some redundancy in the Makefile/Make.global/Make.config mechanism
Diffstat (limited to 'libsi')
-rw-r--r--libsi/Makefile17
1 files changed, 3 insertions, 14 deletions
diff --git a/libsi/Makefile b/libsi/Makefile
index 9d2d40dd..dff5ca9c 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,27 +1,16 @@
#
# Makefile for a libsi
#
-# $Id: Makefile 2.3 2012/01/18 12:31:40 kls Exp $
+# $Id: Makefile 2.4 2012/12/18 13:35:54 kls Exp $
-### The C++ compiler and options:
+### The archiver options:
-CXX ?= g++
-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
AR ?= ar
ARFLAGS ?= ru
RANLIB ?= ranlib
-include ../Make.global
-include ../Make.config
-### The directory environment:
-
-INCLUDES +=
-
-DEFINES +=
-
-LIBS +=
-
### The object files (add further files here):
OBJS = util.o si.o section.o descriptor.o
@@ -31,7 +20,7 @@ OBJS = util.o si.o section.o descriptor.o
%.o: %.c
$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
-# Dependencies:
+### Dependencies:
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies