Hi, Following patch makes it easier for other patches to modify the list of linked libs without conflicting with each other. Also allow to change INCLUDES in Make.config and add -fPIC as that is needed for architectures != i386. Index: vdr-1.3.24/Makefile =================================================================== --- vdr-1.3.24.orig/Makefile +++ vdr-1.3.24/Makefile @@ -12,12 +12,14 @@ CC ?= gcc CFLAGS ?= -O2 CXX ?= g++ -CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual +CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual DVBDIR = ../DVB LSIDIR = ./libsi MANDIR = /usr/local/man BINDIR = /usr/local/bin +LIBS = -ljpeg -lpthread -ldl +INCLUDES = PLUGINDIR= ./PLUGINS PLUGINLIBDIR= $(PLUGINDIR)/lib @@ -29,7 +31,7 @@ DOXYFILE = Doxyfile -include Make.config -INCLUDES = -I$(DVBDIR)/include +INCLUDES += -I$(DVBDIR)/include SILIB = $(LSIDIR)/libsi.a @@ -106,7 +108,7 @@ $(DEPFILE): Makefile # The main program: vdr: $(OBJS) $(SILIB) - $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(SILIB) -o vdr + $(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr # The font files: Index: vdr-1.3.24/Make.config.template =================================================================== --- vdr-1.3.24.orig/Make.config.template +++ vdr-1.3.24/Make.config.template @@ -14,7 +14,7 @@ CC = gcc CFLAGS = -O2 CXX = g++ -CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual +CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual ### The directory environment: cu Ludwig -- (o_ Ludwig Nussel //\ SUSE LINUX Products GmbH, Development V_/_ http://www.suse.de/
