General Makefile cleanup. Also solves Bug #134769

Package-Manager: portage-2.1_rc3-r1

3 files changed, 235 insertions, 50 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index d6d6c3c5ac1c..6b0a7ea3528a 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.13 2006/05/28 13:35:02 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.14 2006/05/29 16:10:36 zzam Exp $
+
+  29 May 2006; Matthias Schwarzott <zzam@gentoo.org>
+  files/linuxtv-dvb-apps-1.1.1-makefile.patch:
+  General Makefile cleanup. Also solves Bug #134769
 
 *linuxtv-dvb-apps-1.1.1 (28 May 2006)
 
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index b93ca1001fb6..94176c842d32 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -21,10 +21,10 @@ AUX linuxtv-dvb-apps-1.1.1-includefile.patch 447 RMD160 a558269921dc22a532656740
 MD5 d31e3f58cf2889830bbeb23fb63ad2e7 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
 RMD160 a558269921dc22a532656740a60762ec59ee5441 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
 SHA256 7c83be3d4698742ad5b5d45dce0f37cdfb9a0e543bb4aba13249194946d8c641 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
-AUX linuxtv-dvb-apps-1.1.1-makefile.patch 4753 RMD160 f3e9805a29e7b1e3cdc559ba9fc7826aa8a64ac9 SHA1 5d8b911990b0be7466b35590b74093506e5c277c SHA256 07a868379f059a7c719b168321637c688fc0d5daebcd88a711c438e18545b0aa
-MD5 8a2a04745bbd97749d1fda333a80061c files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
-RMD160 f3e9805a29e7b1e3cdc559ba9fc7826aa8a64ac9 files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
-SHA256 07a868379f059a7c719b168321637c688fc0d5daebcd88a711c438e18545b0aa files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
+AUX linuxtv-dvb-apps-1.1.1-makefile.patch 9446 RMD160 bfc13963a9e909797f813092dd56d4a10bb53810 SHA1 aaf2f64b74490aa91daadbe3bc72c82e1567411a SHA256 2908028eff9de4d9adb33f52a36d9374391085e1d9a7b94efd7a73e86de1a06f
+MD5 08c12ac8e04cb5ebeedc5cc397516b5f files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
+RMD160 bfc13963a9e909797f813092dd56d4a10bb53810 files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
+SHA256 2908028eff9de4d9adb33f52a36d9374391085e1d9a7b94efd7a73e86de1a06f files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
 DIST dvb-apps-20060423.tar.bz2 258420 RMD160 1374a2f813009391eb6df5f5ecf2993e5e068f25 SHA1 695ea867b9cf24f7ba7258c58da2af858e10c216 SHA256 bff65c334ac7d9cbc7bf4ce20e06f3d2bdc9f69b1452bec2086da7a71e006888
 DIST dvb-apps-snapshot-20050702.tar.bz2 158259 RMD160 054ce63a1b1a2b36b92df6b3b6930ad3ac6a07c2 SHA1 51274426ff6cd7331558cd2b004758842d92797b SHA256 8be4de5da8ab56ad9500ac42636b8444c0fd7cdd38a656d3053af24ae40cda6d
 DIST linuxtv-dvb-apps-1.1.0.tar.bz2 73973 RMD160 ba16fca5565568fc053586794466205c5314b0b9 SHA1 f57966f177eadd94253f9b92280fe00aa1bb3324 SHA256 5b3b6d16995cc31024f2340f9b56bdd28bc8569ac4bf75392575fe9605c1e1b9
@@ -45,10 +45,10 @@ EBUILD linuxtv-dvb-apps-1.1.1.ebuild 1787 RMD160 f0298a913122602c76ce2581eddb800
 MD5 27a626c505e08c4b97e265fefad7470f linuxtv-dvb-apps-1.1.1.ebuild 1787
 RMD160 f0298a913122602c76ce2581eddb8003bd157c17 linuxtv-dvb-apps-1.1.1.ebuild 1787
 SHA256 79bcb47e7dc918e25b5c34026f6420f7fda97a06a6a42bcb67b9ec16df6e4819 linuxtv-dvb-apps-1.1.1.ebuild 1787
-MISC ChangeLog 2953 RMD160 67fbacdb4e70d21df9b513d898cb8ae674f20e15 SHA1 bba34a73ca6f96badffb25d8ddd075aaf3db50af SHA256 ff1bc298c545188009c474ef08865a1d5efb585fee5d39f7c4558d7c25f7c2bb
-MD5 1b863c2563d0fe766bf4dc5361870b6b ChangeLog 2953
-RMD160 67fbacdb4e70d21df9b513d898cb8ae674f20e15 ChangeLog 2953
-SHA256 ff1bc298c545188009c474ef08865a1d5efb585fee5d39f7c4558d7c25f7c2bb ChangeLog 2953
+MISC ChangeLog 3106 RMD160 87b1116c5a3dd091b6fdfdb3d29251b677298057 SHA1 484c5d0eead475a0a87337e2cd9d7e6b71ecef83 SHA256 44ebbbc2e3774ace0d1129b86feda078fed83a71ae048ecffe07b613af0103de
+MD5 f4a7e8b319e91ec666bfdfacb271ff06 ChangeLog 3106
+RMD160 87b1116c5a3dd091b6fdfdb3d29251b677298057 ChangeLog 3106
+SHA256 44ebbbc2e3774ace0d1129b86feda078fed83a71ae048ecffe07b613af0103de ChangeLog 3106
 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217
@@ -68,7 +68,7 @@ SHA256 4424e959e416d21488d896306a153bc50ad70c5af716ac20dd985a618d1e26f7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEeacNZfSl1Kp5KmoRAiwLAJ4+oYuIUDKWTnMDtSGtZetbnV4DLQCcCDGp
-6bTCWX5d+GoTm6jiLJ5bJ6M=
-=KJmC
+iD8DBQFEex0MZfSl1Kp5KmoRAtf2AJkBglSahi18oBK4bZozXJXrJdEkvgCfaMIl
+LJeS7oVL7CRHnvkLx+3fCpI=
+=nv+2
 -----END PGP SIGNATURE-----
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
index 7c58ea9215f3..1fecd4512cfc 100644
--- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
@@ -1,7 +1,40 @@
+diff -ru linuxtv-dvb-apps-1.1.1-orig/test/Makefile linuxtv-dvb-apps-1.1.1/test/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/test/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/test/Makefile	2006-05-29 18:02:49.000000000 +0200
+@@ -1,7 +1,9 @@
+ # 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
++LDFLAGS  ?=
+ 
+ TARGETS = \
+ 	diseqc		\
+@@ -32,6 +34,8 @@
+ 
+ test_sections test_sec_ne test_pes test_tt: hex_dump.o
+ 
++install: all
++
+ clean:
+ 	rm -f $(TARGETS) *.o
+ 
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2006-05-28 15:15:30.000000000 +0200
-@@ -42,6 +42,9 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2006-05-29 18:01:39.000000000 +0200
+@@ -1,5 +1,8 @@
+ CC = gcc
+-CFLAGS = -g -Wall -O2
++CFLAGS ?= -g -Wall -O2
++LDFLAGS ?=
++
++bindir ?= /usr/local/bin
+ 
+ all: av7110_loadkeys evtest
+ 
+@@ -42,6 +45,9 @@
  	@echo '#endif  /* __INPUT_KEYNAMES_H */' >> $@
  	@echo '' >> $@
  
@@ -12,19 +45,32 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile linuxtv-dvb-a
  clean:
  	$(RM) core* *.o input_keynames.h av7110_loadkeys evtest
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2006-05-28 15:20:01.000000000 +0200
-@@ -5,7 +5,7 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2006-05-29 17:56:28.000000000 +0200
+@@ -1,22 +1,24 @@
+ 
+ CC      = gcc
+-CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
+-LFLAGS  =
++CFLAGS   ?= -g -O2 -MD -Wall
++CPPFLAGS += -I. -I../../include
++LDFLAGS  ?=
  
  OBJS    = dvbdate.o
  TARGET  = dvbdate
 -DESTDIR = /usr/local/bin/
++
 +bindir  ?= /usr/local/bin/
  
  all: $(TARGET)
  
-@@ -16,7 +16,7 @@
- 	$(CC) -o $@ $(OBJS) $(LFLAGS)
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) -o $@ $(OBJS) $(LFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
  
  install: all
 -	install -m 755 $(TARGET) $(DESTDIR) 
@@ -33,9 +79,16 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.
  clean:
  	rm -f $(TARGET) $(OBJS) core* *~ *.d
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2006-05-28 15:18:27.000000000 +0200
-@@ -5,7 +5,7 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2006-05-29 17:56:43.000000000 +0200
+@@ -1,26 +1,29 @@
+ 
+ CC      = gcc
+-CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
+-LFLAGS  =
++CFLAGS   ?= -g -O2 -MD -Wall
++CPPFLAGS += -I. -I../../include
++LDFLAGS  ?=
  
  OBJS    = dvbnet.o
  TARGET  = dvbnet
@@ -44,7 +97,18 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.1
  
  all: version.h $(TARGET)
  
-@@ -20,7 +20,7 @@
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++
++dvbnet.o: version.h
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) -o $@ $(OBJS) $(LFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+ 
+ version.h:
+ 	printf '#define VERSION_INFO "%s (Build %s)"\n' \
  		"`cat $@.in`" "`date +'%a %b %d %X %Y'`" > $@
  
  install: all
@@ -54,21 +118,43 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.1
  clean:
  	rm -f $(TARGET) $(OBJS) version.h core* *~ *.d
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/dvbtraffic/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2006-05-28 15:15:30.000000000 +0200
-@@ -2,5 +2,8 @@
- dvbtraffic: dvbtraffic.c
- 	gcc -MD -g -O2 -Wall -I../../include $< -o $@
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbtraffic/Makefile	2004-01-19 18:10:16.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2006-05-29 17:57:10.000000000 +0200
+@@ -1,6 +1,16 @@
  
+-dvbtraffic: dvbtraffic.c
+-	gcc -MD -g -O2 -Wall -I../../include $< -o $@
++CC = gcc
++CFLAGS   ?= -MD -g -O2 -Wall
++CPPFLAGS += -I../../include
++LDFLAGS  ?=
++
++bindir ?= /usr/local/bin
++
++dvbtraffic: dvbtraffic.o
++	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
++
 +install: dvbtraffic
 +	install -m 755 dvbtraffic $(DESTDIR)/$(bindir) 
-+
+ 
  clean:
  	rm -f *.o *.d dvbtraffic
+Nur in linuxtv-dvb-apps-1.1.1/util/lib: lnb.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/lib: lnb.o.
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile linuxtv-dvb-apps-1.1.1/util/lib/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2006-05-28 15:19:28.000000000 +0200
-@@ -8,11 +8,15 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2006-05-29 18:03:00.000000000 +0200
+@@ -1,17 +1,22 @@
+ 
+ CC = gcc
+-CFLAGS = -MD -g -Wall -O2 -I../../include -I.
+-LFLAGS = -g -Wall
++CFLAGS   ?= -MD -g -Wall -O2
++CPPFLAGS += -I../../include -I.
++LDFLAGS  ?= 
+ 
+ OBJS = lnb.o
+ SRCS = $(OBJS:.o=.c)
  
  TARGET = lnb.o
  
@@ -77,29 +163,51 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile linuxtv-dvb-apps-1.1.1/ut
  $(TARGET): $(SRCS)
  
  .c.o:
- 	$(CC) $(CFLAGS) -c $< -o $@
- 
-+install: all
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 +
++install: all
+ 
  clean:
  	$(RM) *.o *.d $(TARGET)
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/Makefile linuxtv-dvb-apps-1.1.1/util/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/Makefile	2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/Makefile	2006-05-29 17:38:39.000000000 +0200
+@@ -8,5 +8,6 @@
+ 	$(MAKE) -C dvbdate $(MAKECMDGOALS)
+ 	$(MAKE) -C dvbtraffic $(MAKECMDGOALS)
+ 	$(MAKE) -C av7110_loadkeys $(MAKECMDGOALS)
++	$(MAKE) -C ttusb_dec_reset $(MAKECMDGOALS)
  
+ FORCE:
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile linuxtv-dvb-apps-1.1.1/util/scan/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2006-05-28 15:30:43.000000000 +0200
-@@ -6,7 +6,7 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile	2006-05-18 01:34:53.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2006-05-29 17:55:21.000000000 +0200
+@@ -1,21 +1,37 @@
+ 
+ CC = gcc
+-CFLAGS = -MD -g -Wall -O2 -I../../include
+-LFLAGS = -g -Wall
++CFLAGS   ?= -MD -g -Wall -O2
++CPPFLAGS += -I../../include
++LDFLAGS  ?= 
+ 
  OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o lnb.o section.o atsc_psip_section.o
  SRCS = $(OBJS:.o=.c)
  
 -TARGET = scan
 +TARGET = dvbscan
++
++bindir ?= /usr/local/bin
  
  $(TARGET): $(OBJS)
- 	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
-@@ -14,8 +14,21 @@
- .c.o:
- 	$(CC) $(CFLAGS) -c $< -o $@
+-	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS)
  
+ .c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++
 +install-bin: $(TARGET)
 +	install -m 755 $(TARGET) $(DESTDIR)/$(bindir) 
 +
@@ -110,7 +218,7 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile linuxtv-dvb-apps-1.1.1/u
 +	; cp `find $$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/scan/$$d/ ; done
 +
 +install: install-bin install-data
-+
+ 
  clean:
  	$(RM) *.o *.d $(TARGET)
  
@@ -118,22 +226,60 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile linuxtv-dvb-apps-1.1.1/u
 +
  -include $(wildcard *.d) dummy
  
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: azap.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: azap.o.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: czap.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: czap.o.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: femon.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: femon.o.
 diff -ru linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile linuxtv-dvb-apps-1.1.1/util/szap/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile	2006-05-28 15:14:41.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2006-05-28 15:24:44.000000000 +0200
-@@ -28,8 +28,19 @@
+--- linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile	2006-05-18 01:31:54.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2006-05-29 17:59:27.000000000 +0200
+@@ -1,11 +1,15 @@
+ CC = gcc
+-CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
+-LFLAGS = -Wall -g -O2
++CFLAGS   ?= -MD -Wall -g -O2
++CPPFLAGS += -I../../include -I../lib
++LDFLAGS  ?= 
+ RM = rm -f
+ 
+ TARGETS = szap tzap czap azap femon
+ OBJS = szap.o tzap.o czap.o azap.o femon.o
+ 
++bindir  ?= /usr/local/bin
++datadir ?= /usr/local/share
++
+ all: $(OBJS) $(TARGETS)
+ 	@echo
+ 	@echo "--------------------------------------------------------------------------------"
+@@ -20,16 +24,30 @@
+ 	@echo
+ 
+ szap: szap.o ../lib/lnb.o
+-	$(CC) $(LFLAGS) -o szap szap.o ../lib/lnb.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../lib/lnb.o
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -o $@ -c $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+ 
  .o:
- 	$(CC) $(LFLAGS) -o $@ $<
+-	$(CC) $(LFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
  
 +install: install-bin install-data
 +install-bin: all
 +	test "$(bindir)/" != "/" && mkdir -p $(DESTDIR)$(bindir)/
-+	for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done
++	for i in $(TARGETS) ; do \
++		install -m 755 $$i $(DESTDIR)$(bindir)/ ; \
++	done
++
 +install-data:
 +	test "$(datadir)/" != "/" && mkdir -p $(DESTDIR)$(datadir)/dvb/zap
 +	for d in dvb-{s,c,t} atsc ; do test -d channels-conf/$$d || continue ; echo ..... $$d ..... \
 +	; mkdir -p $(DESTDIR)$(datadir)/dvb/zap/$$d/ \
-+	; cp `find channels-conf/$$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/zap/$$d/ ; done
++	; install -m 644 `find channels-conf/$$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/zap/$$d/ ; done
  clean:
  	$(RM) $(TARGETS) core* *.o *.d .depend
  
@@ -141,3 +287,38 @@ diff -ru linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile linuxtv-dvb-apps-1.1.1/u
 +
  -include $(wildcard *.d) dummy
  
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: szap.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: szap.o.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: tzap.d.
+Nur in linuxtv-dvb-apps-1.1.1/util/szap: tzap.o.
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/ttusb_dec_reset/Makefile	2004-01-21 23:13:45.000000000 +0100
++++ linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile	2006-05-29 18:03:49.000000000 +0200
+@@ -1,17 +1,21 @@
+ CC	= gcc
+ RM	= rm -f
+-CFLAGS	= -g -Wall -O2
+-LFLAGS	= -g -Wall
+-LDFLAGS = -lusb
++CFLAGS	?= -g -Wall -O2
++LDFLAGS	?= 
++LDADD	+= -lusb
+ 
+ OBJS	= ttusb_dec_reset.o
+ TARGET	= ttusb_dec_reset
+ 
++bindir ?= /usr/local/bin
++
++all: $(TARGET)
++
+ $(TARGET): $(OBJS)
+-	$(CC) $(LFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LDADD)
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) -c $< -o $@
++install: all
++	install -m 755 $(TARGET) $(DESTDIR)/$(bindir)
+ 
+ clean:
+ 	$(RM) *.o $(TARGET)