Skip to content
Snippets Groups Projects
Commit b12f8273 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Separate library install into static and shared installation. 

Originally committed as revision 4983 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e60b4ced
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Makefile
+ 14
− 8
View file @ b12f8273
...@@ -108,10 +108,7 @@ documentation: ...@@ -108,10 +108,7 @@ documentation:
.PHONY: install .PHONY: install
install: all install-progs install-headers install-man $(INSTALLVHOOK) install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
$(MAKE) -C libavutil install
$(MAKE) -C libavcodec install
$(MAKE) -C libavformat install
install-progs: $(PROG) install-progs: $(PROG)
install -d "$(bindir)" install -d "$(bindir)"
...@@ -133,10 +130,19 @@ endif ...@@ -133,10 +130,19 @@ endif
install-vhook: install-vhook:
$(MAKE) -C vhook install $(MAKE) -C vhook install
installlib: install-libs:
$(MAKE) -C libavutil installlib install -d $(libdir)
$(MAKE) -C libavcodec installlib ifeq ($(BUILD_SHARED),yes)
$(MAKE) -C libavformat installlib $(MAKE) -C libavutil install-lib-shared
$(MAKE) -C libavcodec install-lib-shared
$(MAKE) -C libavformat install-lib-shared
$(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
endif
install-headers: install-headers:
$(MAKE) -C libavutil install-headers $(MAKE) -C libavutil install-headers
......
configure
+ 1
− 0
View file @ b12f8273
...@@ -1415,6 +1415,7 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak ...@@ -1415,6 +1415,7 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "BUILD_STATIC=$lstatic" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak
echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
......
libavcodec/Makefile
+ 3
− 8
View file @ b12f8273
...@@ -502,28 +502,23 @@ motion-test: motion_test.o $(LIB) ...@@ -502,28 +502,23 @@ motion-test: motion_test.o $(LIB)
fft-test: fft-test.o $(LIB) fft-test: fft-test.o $(LIB)
$(CC) -o $@ $^ $(LIBAVUTIL) -lm $(CC) -o $@ $^ $(LIBAVUTIL) -lm
ifeq ($(BUILD_SHARED),yes)
install: all install-lib-shared: $(SLIBNAME)
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else else
install -d $(libdir)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
$(libdir)/$(SLIBNAME_WITH_VERSION) $(libdir)/$(SLIBNAME_WITH_VERSION)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME_WITH_MAJOR) $(libdir)/$(SLIBNAME_WITH_MAJOR)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME) $(libdir)/$(SLIBNAME)
$(LDCONFIG) || true
endif endif
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc $@ $(MAKE) -C libpostproc $@
endif endif
else
install:
endif
installlib: all install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc $@ $(MAKE) -C libpostproc $@
......
libavcodec/libpostproc/Makefile
+ 3
− 6
View file @ b12f8273
...@@ -48,23 +48,20 @@ $(LIB): $(OBJS) ...@@ -48,23 +48,20 @@ $(LIB): $(OBJS)
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
install: all
ifeq ($(BUILD_SHARED),yes) install-lib-shared: $(SLIBNAME)
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else else
install -d $(libdir)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
$(libdir)/$(SLIBNAME_WITH_VERSION) $(libdir)/$(SLIBNAME_WITH_VERSION)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME_WITH_MAJOR) $(libdir)/$(SLIBNAME_WITH_MAJOR)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME) $(libdir)/$(SLIBNAME)
$(LDCONFIG) || true
endif
endif endif
installlib: all install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
......
libavformat/Makefile
+ 3
− 8
View file @ b12f8273
...@@ -124,25 +124,20 @@ endif ...@@ -124,25 +124,20 @@ endif
depend: $(SRCS) depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend $(CC) -MM $(CFLAGS) $^ 1>.depend
ifeq ($(BUILD_SHARED),yes)
install: all install-lib-shared: $(SLIBNAME)
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else else
install -d $(libdir)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
$(libdir)/$(SLIBNAME_WITH_VERSION) $(libdir)/$(SLIBNAME_WITH_VERSION)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME_WITH_MAJOR) $(libdir)/$(SLIBNAME_WITH_MAJOR)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME) $(libdir)/$(SLIBNAME)
$(LDCONFIG) || true
endif
else
install:
endif endif
installlib: all install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
......
libavutil/Makefile
+ 2
− 8
View file @ b12f8273
...@@ -60,25 +60,19 @@ distclean: clean ...@@ -60,25 +60,19 @@ distclean: clean
rm -f .depend rm -f .depend
ifeq ($(BUILD_SHARED),yes) install-lib-shared: $(SLIBNAME)
install: all
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else else
install -d $(libdir)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
$(libdir)/$(SLIBNAME_WITH_VERSION) $(libdir)/$(SLIBNAME_WITH_VERSION)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME_WITH_MAJOR) $(libdir)/$(SLIBNAME_WITH_MAJOR)
ln -sf $(SLIBNAME_WITH_VERSION) \ ln -sf $(SLIBNAME_WITH_VERSION) \
$(libdir)/$(SLIBNAME) $(libdir)/$(SLIBNAME)
$(LDCONFIG) || true
endif
else
install:
endif endif
installlib: all install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment