]> granicus.if.org Git - rtmpdump/commitdiff
Drop osx-specific rules. Don't mention cygwin or any other
authorhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 26 Jan 2010 22:46:38 +0000 (22:46 +0000)
committerhyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Tue, 26 Jan 2010 22:46:38 +0000 (22:46 +0000)
platforms. Just override from the command line if you need other settings.

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

Makefile

index 14eb318c410f5251eced5ab0a40a4438dc39a09b..24498924ef2b2d899869bc2826a988709d871dc4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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: