summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-07-28 13:25:30 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2002-07-28 13:25:30 +0200
commit61ccfd5fab3e009bb6feda0647cd958107258819 (patch)
tree9ac13d1ced2e6940a1a8582e2024ace85260f093 /Makefile
parentefc0502b6d7a0e9928ce0272c93295c2c7b06a92 (diff)
downloadvdr-61ccfd5fab3e009bb6feda0647cd958107258819.tar.gz
vdr-61ccfd5fab3e009bb6feda0647cd958107258819.tar.bz2
Now using CC, CFLAGS, CXX and CXXFLAGS
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 11 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7e922184..59908382 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,16 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
+# $Id: Makefile 1.43 2002/07/28 13:24:58 kls Exp $
.DELETE_ON_ERROR:
+CC = gcc
+CFLAGS = -O2
+
+CXX = g++
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+
DVBDIR = ../DVB
DTVDIR = ./libdtv
MANDIR = /usr/local/man
@@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
# Implicit rules:
%.o: %.c
- g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
# Dependencies:
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@@ -72,7 +78,7 @@ $(DEPFILE): Makefile
# The main program:
vdr: $(OBJS) $(DTVLIB)
- g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
+ $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
# The font files:
@@ -84,7 +90,7 @@ fontosd.c:
# The font file generator:
genfontfile: genfontfile.c
- gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
+ $(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
# The libdtv library: