Diff for /multiplexer/makefile between versions 1.9 and 1.10

version 1.9, 2004/10/28 21:08:18 version 1.10, 2005/01/04 21:43:51
Line 8  MANDIR = /usr/local/man/man1 Line 8  MANDIR = /usr/local/man/man1
 CFLAGS = -O -c -Wall -I$(INCLUDEDIR)  CFLAGS = -O -c -Wall -I$(INCLUDEDIR)
 CC = gcc  CC = gcc
   
 OBJS_G = dispatch.o init.o error.o crc32.o input.o output.o command.o global.o descref.o splitpes.o splitps.o splitts.o splice.o  OBJS_G = dispatch.o init.o error.o crc32.o input.o output.o command.o \
           global.o descref.o splitpes.o splitps.o splitts.o splice.o
 OBJ_ts = splicets.o  OBJ_ts = splicets.o
 OBJ_ps = spliceps.o  OBJ_ps = spliceps.o
 OBJS_S = $(OBJ_ts) $(OBJ_ps)  OBJS_S = $(OBJ_ts) $(OBJ_ps)
Line 16  OBJS = $(OBJS_G) $(OBJS_S) Line 17  OBJS = $(OBJS_G) $(OBJS_S)
 OBJS_O = repeatts.o showts.o  OBJS_O = repeatts.o showts.o
 OBJS_TS2PES = ts2pes.o ts2pesdescr.o  OBJS_TS2PES = ts2pes.o ts2pesdescr.o
 OBJS_PES2ES = pes2es.o crc16.o  OBJS_PES2ES = pes2es.o crc16.o
   OBJS_EN300468TS = en300468ts.o
   
 TRGSTEM = iso13818  TRGSTEM = iso13818
 TARGETS_I = $(TRGSTEM)ts $(TRGSTEM)ps  TARGETS_I = $(TRGSTEM)ts $(TRGSTEM)ps
 TARGETS_O = repeatts showts  TARGETS_O = repeatts showts
 TARGET_TS2PES = ts2pes  TARGET_TS2PES = ts2pes
 TARGET_PES2ES = pes2es  TARGET_PES2ES = pes2es
 TARGETS = $(TARGETS_O) $(TARGETS_I) $(TARGET_TS2PES) $(TARGET_PES2ES)  TARGET_EN300468TS = en300468ts
   TARGETS = $(TARGETS_O) $(TARGETS_I) $(TARGET_TS2PES) $(TARGET_PES2ES) \
           $(TARGET_EN300468TS)
   
 HEADERS = dispatch.h error.h crc32.h input.h output.h command.h global.h descref.h splitpes.h splitps.h splitts.h splice.h pes.h ps.h ts.h makefile  HEADERS = dispatch.h error.h crc32.h input.h output.h command.h global.h descref.h splitpes.h splitps.h splitts.h splice.h pes.h ps.h ts.h makefile
   
Line 42  $(TARGET_TS2PES): $(OBJS_TS2PES) crc32.o Line 46  $(TARGET_TS2PES): $(OBJS_TS2PES) crc32.o
 $(TARGET_PES2ES):       $(OBJS_PES2ES)  $(TARGET_PES2ES):       $(OBJS_PES2ES)
         $(CC) -o $@ $(OBJS_PES2ES)          $(CC) -o $@ $(OBJS_PES2ES)
   
   $(TARGET_EN300468TS):   $(OBJS_EN300468TS) crc32.o
           $(CC) -o $@ $(OBJS_EN300468TS) crc32.o
   
 $(OBJS_G) $(OBJS_O):    %.o:    %.c $(HEADERS)  $(OBJS_G) $(OBJS_O):    %.o:    %.c $(HEADERS)
         $(CC) $(CFLAGS) -o $@ $<          $(CC) $(CFLAGS) -o $@ $<
   
Line 54  $(OBJS_TS2PES): %.o: %.c %.h $($(subst . Line 61  $(OBJS_TS2PES): %.o: %.c %.h $($(subst .
 $(OBJS_PES2ES): %.o:    %.c %.h $($(subst .o,.h,$@))  $(OBJS_PES2ES): %.o:    %.c %.h $($(subst .o,.h,$@))
         $(CC) $(CFLAGS) -o $@ $<          $(CC) $(CFLAGS) -o $@ $<
   
   $(OBJS_EN300468TS):     %.o:    %.c $($(subst .o,.h,$@))
           $(CC) $(CFLAGS) -o $@ $<
   
 clean:  clean:
         rm -f *.o *~ $(TARGETS)          rm -f *.o *~ $(TARGETS)
   

Removed from v.1.9  
changed lines
  Added in v.1.10


LinuxTV legacy CVS <linuxtv.org/cvs>