[Ffmpeg-cvslog] CVS: ffmpeg common.mak, NONE, 1.1 Makefile, 1.97, 1.98 configure, 1.251, 1.252

Diego Biurrun CVS diego
Mon Feb 13 13:13:12 CET 2006


Update of /cvsroot/ffmpeg.test/ffmpeg
In directory mail:/var2/tmp/cvs-serv20111

Modified Files:
	Makefile configure 
Added Files:
	common.mak 
Log Message:
lakdjf


--- NEW FILE: common.mak ---
#
# common bits used by all libraries
#

SRC_DIR = $(SRC_PATH)/$(SUBDIR)
VPATH = $(SRC_DIR)

#FIXME: This should be in configure/config.mak
ifeq ($(CONFIG_WIN32),yes)
LDFLAGS = -Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)
endif

ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
LDFLAGS+=-p
endif

ifeq ($(TARGET_ARCH_SPARC64),yes)
CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
endif

SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS)

all: $(LIB) $(SLIBNAME)

$(LIB): $(STATIC_OBJS)
	rm -f $@
	$(AR) rc $@ $^ $(EXTRAOBJS)
	$(RANLIB) $@

$(SLIBNAME): $(SHARED_OBJS)
	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
ifeq ($(CONFIG_WIN32),yes)
	-lib /machine:i386 /def:$(@:.dll=.def)
endif

%.o: %.c
	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<

%.o: %.S
	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<

# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
%.o: %.cpp
	g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<

depend: $(SRCS)
	$(CC) -MM $(CFLAGS) $^ 1>.depend

dep:	depend

clean::
	rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
	      *.lib *.def *.dll.a *.exp

distclean: clean
	rm -f .depend

INSTLIBTARGETS =
ifeq ($(BUILD_SHARED),yes)
INSTLIBTARGETS += install-lib-shared
endif
ifeq ($(BUILD_STATIC),yes)
INSTLIBTARGETS += install-lib-static
endif

install: install-libs install-headers

install-libs: $(INSTLIBTARGETS)

install-lib-shared: $(SLIBNAME)
ifeq ($(CONFIG_WIN32),yes)
	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else
	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
		$(libdir)/$(SLIBNAME_WITH_VERSION)
	ln -sf $(SLIBNAME_WITH_VERSION) \
		$(libdir)/$(SLIBNAME_WITH_MAJOR)
	ln -sf $(SLIBNAME_WITH_VERSION) \
		$(libdir)/$(SLIBNAME)
endif

install-lib-static: $(LIB)
	install -m 644 $(LIB) "$(libdir)"

install-headers:
	install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
	install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"

#
# include dependency files if they exist
#
ifneq ($(wildcard .depend),)
include .depend
endif

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg.test/ffmpeg/Makefile,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Makefile	11 Feb 2006 21:44:55 -0000	1.97
+++ Makefile	13 Feb 2006 12:13:09 -0000	1.98
@@ -139,23 +139,15 @@
 
 install-libs:
 	install -d $(libdir)
-ifeq ($(BUILD_SHARED),yes)
-	$(MAKE) -C libavutil   install-lib-shared
-	$(MAKE) -C libavcodec  install-lib-shared
-	$(MAKE) -C libavformat install-lib-shared
+	$(MAKE) -C libavutil   install-libs
+	$(MAKE) -C libavcodec  install-libs
+	$(MAKE) -C libavformat install-libs
 ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C libavcodec/libpostproc install-lib-shared
+	$(MAKE) -C libavcodec/libpostproc install-libs
 endif
+ifeq ($(BUILD_SHARED),yes)
 	$(LDCONFIG) || true
 endif
-ifeq ($(BUILD_STATIC),yes)
-	$(MAKE) -C libavutil   install-lib-static
-	$(MAKE) -C libavcodec  install-lib-static
-	$(MAKE) -C libavformat install-lib-static
-ifeq ($(CONFIG_PP),yes)
-	$(MAKE) -C libavcodec/libpostproc install-lib-static
-endif
-endif
 
 install-headers:
 	install -d "$(incdir)"

Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg.test/ffmpeg/configure,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- configure	12 Feb 2006 23:14:31 -0000	1.251
+++ configure	13 Feb 2006 12:13:09 -0000	1.252
@@ -1893,6 +1893,8 @@
 fi
 echo "SRC_PATH=$source_path" >> config.mak
 
+echo "BUILD_ROOT=$PWD" >> config.mak
+
 if test "$amr_wb" = "yes" ; then
   echo "#define AMR_WB 1" >> $TMPH
   echo "AMR_WB=yes" >> config.mak





More information about the ffmpeg-cvslog mailing list