From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Sat, 20 Mar 2010 20:10:28 +0000 (+0000)
Subject: GNU vs BSD make syntax issues
X-Git-Tag: v2.4~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40e1338eddd40208ace6ae554f3840ab76ed33a6;p=rtmpdump

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 fe0b8cf..8c88861 100644
--- 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