diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-12 00:00:00 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-12 00:00:00 +0000 |
| commit | fb3d46da6960d56e0a757734b4ea959f4af1063c (patch) | |
| tree | 30f0a1fbfe5c0aef8cdf49880a693d085e4ea24f /libavcodec | |
| parent | 14f0c8e28af6f34411d86fa3f965e5be870024e6 (diff) | |
| download | ffmpeg-fb3d46da6960d56e0a757734b4ea959f4af1063c.tar.gz | |
Move Darwin shared library build peculiarities to configure.
Originally committed as revision 4838 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 5 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5f24dbb9a3..6063dc1a92 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -392,11 +392,6 @@ ifeq ($(TARGET_ARCH_SPARC64),yes) CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc endif -# Darwin specific stuff -ifeq ($(CONFIG_DARWIN),yes) -SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -endif - SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) OBJS := $(OBJS) $(ASM_OBJS) diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 81d3aaaa31..d8c7782737 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -1,3 +1,4 @@ +#FIXME: This Makefile differs from all the others for no good reason... include ../../config.mak @@ -8,11 +9,7 @@ SPPLIBNAME = $(SLIBPREF)postproc$(SLIBSUF) SPPLIBMAJOR = $(SPPLIBNAME).$(SPPMAJOR) SPPLIB = $(SPPLIBNAME).$(SPPVERSION) LIBVERSION = $(SPPLIB) -ifeq ($(CONFIG_DARWIN),yes) -SPPLIBMAJOR = $(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF) -SPPLIB = $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) -SHFLAGS += -Wl,-install_name,$(libdir)/$(SPPLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -endif +SLIBNAME = $(SLIBPREF)postproc$(SLIBSUF) endif PPLIB = $(LIBPREF)postproc$(LIBSUF) |