Browse Source
Separate header file installation from the general install target.
Originally committed as revision 4981 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
Diego Biurrun
19 years ago
5 changed files with 14 additions and 9 deletions
Unified View
Diff Options
-
+6 -1Makefile
-
+2 -2libavcodec/Makefile
-
+2 -2libavcodec/libpostproc/Makefile
-
+2 -2libavformat/Makefile
-
+2 -2libavutil/Makefile
+ 6
- 1
Makefile
View File
| @@ -108,7 +108,7 @@ documentation: | |||||
| .PHONY: install | .PHONY: install | ||||
| install: all install-progs install-man $(INSTALLVHOOK) | |||||
| install: all install-progs install-headers install-man $(INSTALLVHOOK) | |||||
| $(MAKE) -C libavutil install | $(MAKE) -C libavutil install | ||||
| $(MAKE) -C libavcodec install | $(MAKE) -C libavcodec install | ||||
| $(MAKE) -C libavformat install | $(MAKE) -C libavformat install | ||||
| @@ -138,6 +138,11 @@ installlib: | |||||
| $(MAKE) -C libavcodec installlib | $(MAKE) -C libavcodec installlib | ||||
| $(MAKE) -C libavformat installlib | $(MAKE) -C libavformat installlib | ||||
| install-headers: | |||||
| $(MAKE) -C libavutil install-headers | |||||
| $(MAKE) -C libavcodec install-headers | |||||
| $(MAKE) -C libavformat install-headers | |||||
| dep: depend | dep: depend | ||||
| depend: .depend | depend: .depend | ||||
+ 2
- 2
libavcodec/Makefile
View File
| @@ -503,7 +503,7 @@ fft-test: fft-test.o $(LIB) | |||||
| $(CC) -o $@ $^ $(LIBAVUTIL) -lm | $(CC) -o $@ $^ $(LIBAVUTIL) -lm | ||||
| ifeq ($(BUILD_SHARED),yes) | ifeq ($(BUILD_SHARED),yes) | ||||
| install: all install-headers | |||||
| install: all | |||||
| ifeq ($(CONFIG_WIN32),yes) | ifeq ($(CONFIG_WIN32),yes) | ||||
| install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | ||||
| else | else | ||||
| @@ -523,7 +523,7 @@ else | |||||
| install: | install: | ||||
| endif | endif | ||||
| installlib: all install-headers | |||||
| installlib: all | |||||
| install -m 644 $(LIB) "$(libdir)" | install -m 644 $(LIB) "$(libdir)" | ||||
| ifeq ($(CONFIG_PP),yes) | ifeq ($(CONFIG_PP),yes) | ||||
| $(MAKE) -C libpostproc $@ | $(MAKE) -C libpostproc $@ | ||||
+ 2
- 2
libavcodec/libpostproc/Makefile
View File
| @@ -48,7 +48,7 @@ $(LIB): $(OBJS) | |||||
| $(AR) rc $@ $(OBJS) | $(AR) rc $@ $(OBJS) | ||||
| $(RANLIB) $@ | $(RANLIB) $@ | ||||
| install: all install-headers | |||||
| install: all | |||||
| ifeq ($(BUILD_SHARED),yes) | ifeq ($(BUILD_SHARED),yes) | ||||
| ifeq ($(CONFIG_WIN32),yes) | ifeq ($(CONFIG_WIN32),yes) | ||||
| install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | ||||
| @@ -64,7 +64,7 @@ else | |||||
| endif | endif | ||||
| endif | endif | ||||
| installlib: all install-headers | |||||
| installlib: all | |||||
| install -m 644 $(LIB) "$(libdir)" | install -m 644 $(LIB) "$(libdir)" | ||||
| install-headers: | install-headers: | ||||
+ 2
- 2
libavformat/Makefile
View File
| @@ -125,7 +125,7 @@ depend: $(SRCS) | |||||
| $(CC) -MM $(CFLAGS) $^ 1>.depend | $(CC) -MM $(CFLAGS) $^ 1>.depend | ||||
| ifeq ($(BUILD_SHARED),yes) | ifeq ($(BUILD_SHARED),yes) | ||||
| install: all install-headers | |||||
| install: all | |||||
| ifeq ($(CONFIG_WIN32),yes) | ifeq ($(CONFIG_WIN32),yes) | ||||
| install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | ||||
| else | else | ||||
| @@ -142,7 +142,7 @@ else | |||||
| install: | install: | ||||
| endif | endif | ||||
| installlib: all install-headers | |||||
| installlib: all | |||||
| install -m 644 $(LIB) "$(libdir)" | install -m 644 $(LIB) "$(libdir)" | ||||
| install-headers: | install-headers: | ||||
+ 2
- 2
libavutil/Makefile
View File
| @@ -61,7 +61,7 @@ distclean: clean | |||||
| ifeq ($(BUILD_SHARED),yes) | ifeq ($(BUILD_SHARED),yes) | ||||
| install: all install-headers | |||||
| install: all | |||||
| ifeq ($(CONFIG_WIN32),yes) | ifeq ($(CONFIG_WIN32),yes) | ||||
| install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" | ||||
| else | else | ||||
| @@ -78,7 +78,7 @@ else | |||||
| install: | install: | ||||
| endif | endif | ||||
| installlib: all install-headers | |||||
| installlib: all | |||||
| install -m 644 $(LIB) "$(libdir)" | install -m 644 $(LIB) "$(libdir)" | ||||
| install-headers: | install-headers: | ||||