GNU vs BSD make syntax issues

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@373 400ebc74-4327-4243-bc38-086b20814532

diff --git a/Makefile b/Makefile
index fe0b8cf3a6d8cace257279508e9eaae863a48f3c..8c888616873c0bfc7a4e32e7345d868fcdcef8b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,24 +35,27 @@ cross:
 
 clean:
        rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
-       @$(MAKE) -C librtmp clean
+       @cd librtmp; $(MAKE) clean
 
 FORCE:
 
 $(LIBRTMP): FORCE
-       @$(MAKE) -C librtmp all CC="$(CC)" CFLAGS="$(CFLAGS)"
+       @cd librtmp; $(MAKE) all CC="$(CC)" CFLAGS="$(CFLAGS)"
+
+# note: $^ is GNU Make's equivalent to BSD $>
+# we use both since either make will ignore the one it doesn't recognize
 
 rtmpdump: rtmpdump.o $(LIBRTMP)
-       $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
+       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
 
 rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
-       $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
+       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
 rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
-       $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
+       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
 rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
-       $(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
+       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
 rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
 rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile