--- multiplexer/makefile	2010/02/03 14:06:00	1.17
+++ multiplexer/makefile	2010/09/22 21:01:37	1.18
@@ -56,7 +56,7 @@ all:	$(TARGETS) $(MANGEN)
 %:      %.o
 
 $(TARGETS_I):	$(OBJS)
-	$(CC) -o $@ $(OBJS_G) $($(subst $(TRGSTEM),OBJ_,$@))
+	$(CC) -o $@ $(OBJS_G) $($(patsubst $(TRGSTEM)%,OBJ_%,$@))
 
 $(TARGETS_O): % : %.o
 	$(CC) -o $* $@.o
@@ -76,14 +76,13 @@ $(OBJS_G) $(OBJS_O):	%.o:	%.c $(HEADERS)
 $(OBJS_S):	%.o:	%.c %.h $(HEADERS)
 	$(CC) $(CFLAGS) -o $@ $<
 
-$(OBJS_TS2PES):	%.o:	%.c %.h $($(subst .o,.h,$@))
+$(OBJS_TS2PES):	%.o:	%.c %.h
 	$(CC) $(CFLAGS) -o $@ $<
 
-$(OBJS_PES2ES):	%.o:	%.c %.h $($(subst .o,.h,$@))
+$(OBJS_PES2ES):	%.o:	%.c %.h
 	$(CC) $(CFLAGS) -o $@ $<
 
-$(OBJS_EN300468TS):	%.o:	%.c $($(subst .o,.h,$@)) $(DEFS_INCSRC) \
-		makefile
+$(OBJS_EN300468TS):	%.o:	%.c $(DEFS_INCSRC) makefile
 	$(CC) $(CFLAGS) -o $@ $<
 
 install:	install_bin install_man