1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Now using CC, CFLAGS, CXX and CXXFLAGS

This commit is contained in:
Klaus Schmidinger 2002-07-28 13:25:30 +02:00
parent efc0502b6d
commit 61ccfd5fab
2 changed files with 12 additions and 5 deletions

View File

@ -1389,3 +1389,4 @@ Video Disk Recorder Revision History
- Added some missing teletext PIDs (thanks to Joerg Riechardt). - Added some missing teletext PIDs (thanks to Joerg Riechardt).
- Fixed PID handling for cReceiver. - Fixed PID handling for cReceiver.
- Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid). - Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid).
- Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile.

View File

@ -4,10 +4,16 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .DELETE_ON_ERROR:
CC = gcc
CFLAGS = -O2
CXX = g++
CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
DVBDIR = ../DVB DVBDIR = ../DVB
DTVDIR = ./libdtv DTVDIR = ./libdtv
MANDIR = /usr/local/man MANDIR = /usr/local/man
@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
# Implicit rules: # Implicit rules:
%.o: %.c %.o: %.c
g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $< $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
# Dependencies: # Dependencies:
MAKEDEP = g++ -MM -MG MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies DEPFILE = .dependencies
$(DEPFILE): Makefile $(DEPFILE): Makefile
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@ -72,7 +78,7 @@ $(DEPFILE): Makefile
# The main program: # The main program:
vdr: $(OBJS) $(DTVLIB) 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: # The font files:
@ -84,7 +90,7 @@ fontosd.c:
# The font file generator: # The font file generator:
genfontfile: genfontfile.c genfontfile: genfontfile.c
gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11 $(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
# The libdtv library: # The libdtv library: