--- multiplexer/makefile	2004/01/23 01:38:49	1.8
+++ multiplexer/makefile	2004/10/28 21:08:18	1.9
@@ -8,19 +8,23 @@ MANDIR = /usr/local/man/man1
 CFLAGS = -O -c -Wall -I$(INCLUDEDIR)
 CC = gcc
 
-OBJS_G = dispatch.o init.o error.o crc.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_ps = spliceps.o
 OBJS_S = $(OBJ_ts) $(OBJ_ps)
 OBJS = $(OBJS_G) $(OBJS_S)
 OBJS_O = repeatts.o showts.o
+OBJS_TS2PES = ts2pes.o ts2pesdescr.o
+OBJS_PES2ES = pes2es.o crc16.o
 
 TRGSTEM = iso13818
 TARGETS_I = $(TRGSTEM)ts $(TRGSTEM)ps
 TARGETS_O = repeatts showts
-TARGETS = $(TARGETS_O) $(TARGETS_I)
+TARGET_TS2PES = ts2pes
+TARGET_PES2ES = pes2es
+TARGETS = $(TARGETS_O) $(TARGETS_I) $(TARGET_TS2PES) $(TARGET_PES2ES)
 
-HEADERS = dispatch.h error.h crc.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
 
 .PHONY:	all clean install uninstall
 
@@ -32,12 +36,24 @@ $(TARGETS_I):	$(OBJS)
 $(TARGETS_O): % : %.o
 	$(CC) -o $* $@.o
 
+$(TARGET_TS2PES):	$(OBJS_TS2PES) crc32.o
+	$(CC) -o $@ $(OBJS_TS2PES) crc32.o
+
+$(TARGET_PES2ES):	$(OBJS_PES2ES)
+	$(CC) -o $@ $(OBJS_PES2ES)
+
 $(OBJS_G) $(OBJS_O):	%.o:	%.c $(HEADERS)
 	$(CC) $(CFLAGS) -o $@ $<
 
 $(OBJS_S):	%.o:	%.c %.h $(HEADERS)
 	$(CC) $(CFLAGS) -o $@ $<
 
+$(OBJS_TS2PES):	%.o:	%.c %.h $($(subst .o,.h,$@))
+	$(CC) $(CFLAGS) -o $@ $<
+
+$(OBJS_PES2ES):	%.o:	%.c %.h $($(subst .o,.h,$@))
+	$(CC) $(CFLAGS) -o $@ $<
+
 clean:
 	rm -f *.o *~ $(TARGETS)