Hi,

The following patch for dvb-apps allows to override CFLAGS with
custom optimizations without losing include paths.

%patch
Index: linuxtv-dvb-apps-1.1.0/test/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/test/Makefile   2004-01-17 17:59:46.000000000 +0100
+++ linuxtv-dvb-apps-1.1.0/test/Makefile        2004-02-05 21:18:21.261644338 +0100
@@ -1,7 +1,8 @@
 # Makefile for Linux DVB API Version 3 test programs
 
 CC = gcc
-CFLAGS = -g -O2 -W -Wall -I../include
+CFLAGS = -g -O2 -W -Wall
+CPPFLAGS = -I../include
 
 TARGETS = \
        diseqc          \
@@ -34,4 +35,3 @@
 
 clean:
        rm -f $(TARGETS) *.o
-
Index: linuxtv-dvb-apps-1.1.0/util/lib/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile       2004-01-17 17:59:46.000000000 
+0100
+++ linuxtv-dvb-apps-1.1.0/util/lib/Makefile    2004-02-05 21:18:21.261644338 +0100
@@ -1,7 +1,7 @@
 
 CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include -I.
-LFLAGS = -g -Wall
+CFLAGS = -g -Wall -O2
+CPPFLAGS = -MD -I../../include -I.
 
 OBJS = lnb.o
 SRCS = $(OBJS:.o=.c)
@@ -11,7 +11,7 @@
 $(TARGET): $(SRCS)
 
 .c.o:
-       $(CC) $(CFLAGS) -c $< -o $@
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 clean:
        $(RM) *.o *.d $(TARGET)
Index: linuxtv-dvb-apps-1.1.0/util/scan/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile      2004-01-17 17:59:46.000000000 
+0100
+++ linuxtv-dvb-apps-1.1.0/util/scan/Makefile   2004-02-05 21:18:21.262644272 +0100
@@ -1,6 +1,7 @@
 
 CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include -I../lib
+CFLAGS = -g -Wall -O2
+CPPFLAGS = -MD -I../../include -I../lib
 LFLAGS = -g -Wall
 
 OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o ../lib/lnb.o
@@ -12,7 +13,7 @@
        $(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
 
 .c.o:
-       $(CC) $(CFLAGS) -c $< -o $@
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 clean:
        $(RM) *.o *.d $(TARGET)
Index: linuxtv-dvb-apps-1.1.0/util/szap/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile      2004-01-17 17:59:46.000000000 
+0100
+++ linuxtv-dvb-apps-1.1.0/util/szap/Makefile   2004-02-05 21:18:21.262644272 +0100
@@ -1,5 +1,6 @@
 CC = gcc
-CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
+CFLAGS = -Wall -g -O2
+CPPFLAGS = -MD -I../../include -I../lib
 LFLAGS = -Wall -g -O2
 RM = rm -f
 
@@ -23,7 +24,7 @@
        $(CC) $(LFLAGS) -o szap szap.o ../lib/lnb.o
 
 .c.o:
-       $(CC) $(CFLAGS) -o $@ -c $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 .o:
        $(CC) $(LFLAGS) -o $@ $<
Index: linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile    2004-01-17 17:59:46.000000000 
+0100
+++ linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile 2004-02-05 21:18:21.263644206 +0100
@@ -1,6 +1,7 @@
 
 CC      = gcc
-CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
+CFLAGS  = -g -O2 -Wall
+CPPFLAGS= -MD -I. -I../../include
 LFLAGS  =
 
 OBJS    = dvbnet.o
@@ -10,7 +11,7 @@
 all: version.h $(TARGET)
 
 .c.o:
-       $(CC) $(CFLAGS) -c $< -o $@
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 $(TARGET): $(OBJS)
        $(CC) -o $@ $(OBJS) $(LFLAGS)
Index: linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile
===================================================================
--- linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile        2004-01-19 
18:10:16.000000000 +0100
+++ linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile     2004-02-05 21:18:21.263644206 
+0100
@@ -1,6 +1,8 @@
+CFLAGS   = -g -O2 -Wall
+CPPFLAGS = -MD -I../../include
 
 dvbtraffic: dvbtraffic.c
-       gcc -MD -g -O2 -Wall -I../../include $< -o $@
+       $(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 clean:
        rm -f *.o *.d dvbtraffic


cu
Ludwig

-- 
(o_  [EMAIL PROTECTED]
//\  PGP Key ID: FF8135CE
V_/_ ICQ:        52166811

Attachment: pgp00000.pgp
Description: PGP signature

Reply via email to