From 7669899bdf2d1b416a13fa2ba763e28c1fbedafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 7 Apr 2008 21:16:50 +0000 Subject: [PATCH] non-recursive makefiles Originally committed as revision 26346 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libswscale/Makefile b/libswscale/Makefile index d99cb56bd1..20ace9e471 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -1,4 +1,4 @@ -include ../config.mak +include $(SUBDIR)../config.mak NAME = swscale FFLIBS = avutil @@ -15,12 +15,11 @@ ASM_OBJS-$(ARCH_BFIN) += internal_bfin.o HEADERS = swscale.h rgb2rgb.h -include ../common.mak +CLEANFILES = cs_test swscale-example -cs_test: cs_test.o $(LIBNAME) +include $(SUBDIR)../subdir.mak -swscale-example: swscale-example.o $(LIBNAME) -swscale-example: EXTRALIBS += -lm +$(SUBDIR)cs_test: $(SUBDIR)cs_test.o $(SUBDIR)$(LIBNAME) -clean:: - rm -f cs_test swscale-example +$(SUBDIR)swscale-example: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME) +$(SUBDIR)swscale-example: EXTRALIBS += -lm