--- multiplexer/makefile	2001/03/19 20:52:34	1.1
+++ multiplexer/makefile	2001/04/03 21:14:33	1.2
@@ -1,17 +1,21 @@
 # make iso 13818-1 stream multiplexer
 
 INCLUDEDIR = /usr/include
+SHELL = /bin/bash
+BINDIR = /usr/bin
+MANDIR = /usr/man/man1
 
 CFLAGS = -O -c -Wall -mpreferred-stack-boundary=2 -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
+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
 OBJ_ts = splicets.o
 OBJ_ps = spliceps.o
-OBJS = $(OBJS_G) $(OBJ_ts) $(OBJ_ps)
+OBJS_S = $(OBJ_ts) $(OBJ_ps)
+OBJS = $(OBJS_G) $(OBJS_S)
 
 TRGSTEM = iso13818
-TARGETS = $(TRGSTEM)ps $(TRGSTEM)ts
+TARGETS = $(TRGSTEM)ts $(TRGSTEM)ps
 
 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
 
@@ -22,14 +26,17 @@ all:	$(TARGETS)
 $(TARGETS):	$(OBJS)
 	$(CC) -o $@ $(OBJS_G) $($(subst $(TRGSTEM),OBJ_,$@))
 
-$(OBJS):	%.o:	%.c $(HEADERS)
+$(OBJS_G):	%.o:	%.c $(HEADERS)
+	$(CC) $(CFLAGS) -o $@ $<
+
+$(OBJS_S):	%.o:	%.c %.h $(HEADERS)
 	$(CC) $(CFLAGS) -o $@ $<
 
 install:
-	install -d /usr/bin
-	install -c -m 755 $(TRGSTEM)?? /usr/bin
-	install -c -m 644 $(TRGSTEM)??.1 /usr/man/man1
+	install -d $(BINDIR) $(MANDIR)
+	install -c -m 755 $(TRGSTEM)*[[:alnum:]]? $(BINDIR)
+	install -c -m 644 $(TRGSTEM)*.1 $(MANDIR)
 
 clean:
-	rm -f *.o *~ core $(TRGSTEM)??
+	rm -f *.o *~ $(TRGSTEM)*[[:alnum:]]?