[linux-dvb] A Patch to make dvb-apps Makefiles sane

[Per Dalén]

Matthias Schwarzott wrote:
> Hi!
> I have a patch to correct some Makefile issues.
> 
> Changes:
> 1. compile when CFLAGS is set in environment.
> 2. make install works now

I did not see this patch, so I did a similar patch for #2 that is in cvs 
now.

> 3. install ca_zap
> 

The patch (#3) did not work for me, but it is nice to have ca_zap 
installed (specially when it works so well now ;).


root at oden:/home/perda/no_backup/dvb/dvb-apps# make install
make -C lib/libdvbsi install
make[1]: Entering directory 
`/backups/perda/no_backup/dvb/dvb-apps/lib/libdvbsi'
make[1]: Nothing to be done for `install'.
make[1]: Leaving directory 
`/backups/perda/no_backup/dvb/dvb-apps/lib/libdvbsi'
make -C lib/libdvben50221 install
make[1]: Entering directory 
`/backups/perda/no_backup/dvb/dvb-apps/lib/libdvben50221'
make[1]: Nothing to be done for `install'.
make[1]: Leaving directory 
`/backups/perda/no_backup/dvb/dvb-apps/lib/libdvben50221'
make -C util install
make[1]: Entering directory `/backups/perda/no_backup/dvb/dvb-apps/util'
make -C lib install
make[2]: Entering directory `/backups/perda/no_backup/dvb/dvb-apps/util/lib'
make[2]: Nothing to be done for `install'.
make[2]: Leaving directory `/backups/perda/no_backup/dvb/dvb-apps/util/lib'
make -C szap install
make[2]: Entering directory 
`/backups/perda/no_backup/dvb/dvb-apps/util/szap'
test "/usr/local/bin/" != "/"
mkdir -p /usr/local/bin/
for i in azap szap tzap czap femon ; do cp $i /usr/local/bin/ ; done
test "/usr/local/share/" != "/"
mkdir -p /usr/local/share/dvb/zap
for d in dvb-{s,c,t} atsc ; do test -d channels-conf/$d || continue ; 
echo ..... $d ..... \
; mkdir -p /usr/local/share/dvb/zap/$d/ \
; cp `find channels-conf/$d -type f|grep -v CVS` 
/usr/local/share/dvb/zap/$d/ ; done
..... dvb-s .....
..... dvb-c .....
..... dvb-t .....
..... atsc .....
make[2]: Leaving directory `/backups/perda/no_backup/dvb/dvb-apps/util/szap'
make -C ca_zap install
make[2]: Entering directory 
`/backups/perda/no_backup/dvb/dvb-apps/util/ca_zap'
test "/" != "/"
make[2]: *** [install-bin] Error 1
make[2]: Leaving directory 
`/backups/perda/no_backup/dvb/dvb-apps/util/ca_zap'
make[1]: *** [install] Error 2
make[1]: Leaving directory `/backups/perda/no_backup/dvb/dvb-apps/util'
make: *** [install] Error 2


I just added "bindir = /usr/local/bin" in dvb-apps/util/ca_zap/Makefile 
to make it work (took it from dvb-apps/util/szap/Makefile).

> Matthias Schwarzott
> 

/Per

> 
> ------------------------------------------------------------------------
> 
> diff -ru dvb-apps-orig/libs/libdvbcfg/Makefile dvb-apps/libs/libdvbcfg/Makefile
> --- dvb-apps-orig/libs/libdvbcfg/Makefile	2005-10-17 12:27:41.000000000 +0200
> +++ dvb-apps/libs/libdvbcfg/Makefile	2005-10-17 12:28:08.000000000 +0200
> @@ -30,8 +30,8 @@
>  
>  DVBCFG_DEFAULT_DIR = /etc/dvb
>  
> -CFLAGS ?= -fPIC -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -DDVBCFG_DEFAULT_DIR=\"$(DVBCFG_DEFAULT_DIR)\"
> -CPPFLAGS = -I. -I../../include
> +CFLAGS ?= -fPIC -O2 -g -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith
> +CPPFLAGS = -I. -I../../include -DDVBCFG_DEFAULT_DIR=\"$(DVBCFG_DEFAULT_DIR)\"
>  LDFLAGS = -shared -lc
> 
>  STATICLIB = libdvbcfg.a
> --- dvb-apps-orig/util/ca_zap/Makefile	2005-10-17 12:34:07.000000000 +0200
> +++ dvb-apps/util/ca_zap/Makefile	2005-10-17 12:34:07.000000000 +0200
> @@ -16,6 +16,11 @@
>  clean:
>  	$(RM) $(TARGETS) *.o *.d ca_zap
>  
> -install:
> +install: install-bin install-data
> +install-bin:
> +	test "$(bindir)/" != "/"
> +	mkdir -p $(DESTDIR)$(bindir)/
> +	for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done
> +install-data:
>  
>  -include $(wildcard *.d) dummy
> --- dvb-apps-orig/libs/libsi2/dvb/Makefile	2005-10-17 12:36:48.000000000 +0200
> +++ dvb-apps/libs/libsi2/dvb/Makefile	2005-10-17 12:36:58.000000000 +0200
> @@ -20,7 +20,6 @@
>        bat_section.h \
>        dit_section.h \
>        eit_section.h \
> -      int_sectio.h \
>        nit_section.h \
>        rst_section.h \
>        sdt_section.h \
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> linux-dvb mailing list
> linux-dvb at linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb