[MPlayer-cvslog] r18994 - in trunk: Makefile libswscale/Makefile

[lucabe]

Author: lucabe
Date: Mon Jul 10 14:35:52 2006
New Revision: 18994

Modified:
   trunk/Makefile
   trunk/libswscale/Makefile

Log:
make libswscale build system similar to the libav* one


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Jul 10 14:35:52 2006
@@ -313,7 +313,7 @@
 	$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
 
 libswscale/libswscale.a:
-	$(MAKE) -C libswscale
+	$(MAKE) -C libswscale LIBPREF=lib LIBSUF=.a
 
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2

Modified: trunk/libswscale/Makefile
==============================================================================
--- trunk/libswscale/Makefile	(original)
+++ trunk/libswscale/Makefile	Mon Jul 10 14:35:52 2006
@@ -1,52 +1,22 @@
 
 include ../config.mak
 
-SWSLIB = libswscale.a
-
-SWSSRCS=swscale.c rgb2rgb.c yuv2rgb.c
+NAME=swscale
+ifeq ($(BUILD_SHARED),yes)
+LIBVERSION=$(SWSVERSION)
+LIBMAJOR=$(SWSMAJOR)
+endif
 
-SWSOBJS=$(SWSSRCS:.c=.o)
+# NOTE: -I.. is needed to include config.h
+CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+       -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+       -D_GNU_SOURCE
 
+OBJS= swscale.o rgb2rgb.o yuv2rgb.o
 ifeq ($(TARGET_ALTIVEC),yes)
-SWSOBJS +=  yuv2rgb_altivec.o
+OBJS+=  yuv2rgb_altivec.o
 endif
 
-CFLAGS  = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
-# -I/usr/X11R6/include/
-
-.SUFFIXES: .c .o
-
-# .PHONY: all clean
-
-.c.o:
-	$(CC) -c $(CFLAGS) -I.. -o $@ $<
-
-all:    $(SWSLIB)
-
-$(SWSLIB):     $(SWSOBJS)
-	$(AR) r $(SWSLIB) $(SWSOBJS)
-	$(RANLIB) $(SWSLIB)
-
-clean:
-	rm -f *.o *.a *~ *.so cs_test swscale-example
-
-distclean: clean
-	rm -f .depend
-
-dep:    depend
-
-depend:
-	$(CC) -MM $(CFLAGS) $(SWSSRCS) 1>.depend
-
-cs_test: cs_test.o $(SWSLIB)
-	$(CC) cs_test.o $(SWSLIB) ../cpudetect.o -DFOR_MENCODER ../mp_msg.c -o cs_test -W -Wall
-
-swscale-example: swscale-example.o $(SWSLIB)
-	$(CC) swscale-example.o $(SWSLIB) ../libmpcodecs/img_format.o -lm -o swscale-example -W -Wall
-#
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+HEADERS = swscale.h rgb2rgb.h
 
+include $(SRC_PATH)/common.mak