simplify

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index f84c27bfee1354f1066ac323ae6e2b4546fe6536..42e4d41ea1b5c3cb6cf207e86c81c1159296bcac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,11 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
 
-ifeq ($(TARGET_GPROF),yes)
-CFLAGS+=-p
-LDFLAGS+=-p
-endif
-
 MANPAGES=doc/ffmpeg.1
 PROGS_G+=ffmpeg_g$(EXESUF)
 PROGS+=ffmpeg$(EXESUF)
@@ -52,12 +49,6 @@ VHOOK=videohook
 INSTALLVHOOK=install-vhook
 endif
 
-ifeq ($(TARGET_OS), SunOS)
-TEST=/usr/bin/test
-else
-TEST=test
-endif
-
 ifeq ($(BUILD_DOC),yes)
 DOC=documentation
 endif
@@ -133,7 +124,7 @@ wininstaller: all install
 
 # install man from source dir if available
 install-man:
-ifneq ($(CONFIG_WIN32),yes)
+ifneq ($(CONFIG_MINGW),yes)
        if [ -f doc/ffmpeg.1 ] ; then \
            install -d "$(mandir)/man1" ; \
            install -m 644 $(MANPAGES) "$(mandir)/man1" ; \
@@ -168,7 +159,7 @@ uninstall-progs:
        rm -f $(addprefix $(bindir)/, $(ALLPROGS))
 
 uninstall-man:
-ifneq ($(CONFIG_WIN32),yes)
+ifneq ($(CONFIG_MINGW),yes)
        rm -f $(addprefix $(mandir)/man1/,$(ALLMANPAGES))
 endif
 
@@ -204,7 +195,7 @@ endif
 
 .libs: lib
        @test -f .libs || touch .libs
-       @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
+       @for i in $(DEP_LIBS) ; do if test $$i -nt .libs ; then touch .libs; fi ; done
 
 clean:
        $(MAKE) -C libavutil   clean
@@ -225,7 +216,7 @@ distclean: clean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C tests       distclean
        $(MAKE) -C vhook       distclean
-       rm -f .depend config.mak config.h version.h *.pc config.err config.log
+       rm -f .depend version.h config.* *.pc
 
 TAGS:
        etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]