[rtmpdump] r241 - trunk/Makefile

[hyc]

Author: hyc
Date: Tue Jan 26 23:46:38 2010
New Revision: 241

Log:
Drop osx-specific rules. Don't mention cygwin or any other
platforms. Just override from the command line if you need other settings.

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Jan 19 03:26:45 2010	(r240)
+++ trunk/Makefile	Tue Jan 26 23:46:38 2010	(r241)
@@ -12,27 +12,22 @@ SLIBS=$(THREADLIB) $(LIBS)
 EXT=
 
 all:
-	@echo 'use "make linux" for a native Linux build, or'
-	@echo '    "make osx"   for a native OSX build, or'
-	@echo '    "make mingw" for a MinGW32 build, or'
-	@echo '    "make cygwin" for a CygWin build, or'
-	@echo '    "make arm"   for a cross-compiled Linux ARM build'
+	@echo 'use "make posix" for a native Linux/Unix build, or'
+	@echo '    "make mingw" for a MinGW32 build'
+	@echo 'use commandline overrides if you want anything else'
 
 progs:	rtmpdump streams rtmpsrv rtmpsuck
 
-linux:
+posix linux unix osx:
 	@$(MAKE) $(MAKEFLAGS) progs
 
-osx:
-	@$(MAKE) XCFLAGS="-arch ppc -arch i386" $(MAKEFLAGS) progs
-
 mingw:
 	@$(MAKE) CROSS_COMPILE=mingw32- LIBS="$(LIBS) -lws2_32 -lwinmm -lgdi32" THREADLIB= EXT=.exe $(MAKEFLAGS) progs
 
 cygwin:
 	@$(MAKE) XCFLAGS=-static XLDFLAGS="-static-libgcc -static" EXT=.exe $(MAKEFLAGS) progs
 
-arm:
+cross:
 	@$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs
 
 clean: