Separate header file installation from the general install target.

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 7c2cd937f2dfbca4560db59f3ff84ba91c6591dc..6b4cab0a7b95a60aee78e38a20226b0206efe517 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-LDFLAGS+= -g 
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+LDFLAGS+= -g
 
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
@@ -15,7 +15,8 @@ LDFLAGS+=-p
 endif
 
 MANPAGE=doc/ffmpeg.1
-PROG=ffmpeg$(EXESUF)
+PROG_G+=ffmpeg_g$(EXESUF)
+PROG+=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
 QTFASTSTART=qt-faststart$(EXESUF)
 
@@ -26,6 +27,7 @@ endif
 
 ifeq ($(CONFIG_FFPLAY),yes)
 MANPAGE+=doc/ffplay.1
+PROG_G+=ffplay_g$(EXESUF)
 PROG+=ffplay$(EXESUF)
 FFPLAY_O=ffplay.o
 endif
@@ -38,45 +40,11 @@ ifeq ($(BUILD_SHARED),yes)
 DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
-ifeq ($(CONFIG_MP3LAME),yes)
-EXTRALIBS+=-lmp3lame
-endif
-endif
-
-ifeq ($(CONFIG_LIBOGG),yes)
-EXTRALIBS+= -logg 
-ifeq ($(CONFIG_LIBVORBIS),yes)
-EXTRALIBS+= -lvorbis -lvorbisenc
-endif
-ifeq ($(CONFIG_LIBTHEORA),yes)
-EXTRALIBS+= -ltheora
-endif
-endif
-
-ifeq ($(CONFIG_FAAD),yes)
-ifeq ($(CONFIG_FAADBIN),yes)
-# no libs needed
-else
-EXTRALIBS += -lfaad
-endif
-endif
-
-ifeq ($(CONFIG_FAAC),yes)
-EXTRALIBS+=-lfaac
-endif
-
-ifeq ($(CONFIG_XVID),yes)
-EXTRALIBS+=-lxvidcore
-endif
-
-ifeq ($(CONFIG_DC1394),yes)
-EXTRALIBS+=-ldc1394_control -lraw1394
 endif
 
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
-CLEANVHOOK=clean-vhook
 endif
 
 ifeq ($(TARGET_OS), SunOS)
@@ -91,11 +59,12 @@ endif
 
 OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
+FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
 
-all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: lib $(PROG_G) $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
+       $(MAKE) -C libavutil all
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
@@ -107,7 +76,7 @@ ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
        $(STRIP) $@
 
 ffserver$(EXESUF): ffserver.o .libs
-       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
@@ -126,10 +95,10 @@ cws2fws$(EXESUF): cws2fws.c
        $(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
 
 ffplay.o: ffplay.c
-       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
+       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
 
 %.o: %.c
-       $(CC) $(CFLAGS) -c -o $@ $< 
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 videohook: .libs
        $(MAKE) -C vhook all
@@ -139,9 +108,12 @@ documentation:
 
 .PHONY: install
 
-install: all install-man $(INSTALLVHOOK)
+install: all install-progs install-headers install-man $(INSTALLVHOOK)
+       $(MAKE) -C libavutil install
        $(MAKE) -C libavcodec install
        $(MAKE) -C libavformat install
+
+install-progs: $(PROG)
        install -d "$(bindir)"
        install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
 
@@ -162,9 +134,15 @@ install-vhook:
        $(MAKE) -C vhook install
 
 installlib:
+       $(MAKE) -C libavutil installlib
        $(MAKE) -C libavcodec installlib
        $(MAKE) -C libavformat installlib
 
+install-headers:
+       $(MAKE) -C libavutil   install-headers
+       $(MAKE) -C libavcodec  install-headers
+       $(MAKE) -C libavformat install-headers
+
 dep:   depend
 
 depend: .depend
@@ -181,20 +159,23 @@ endif
        @test -f .libs || touch .libs
        @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
-clean: $(CLEANVHOOK)
+clean:
+       $(MAKE) -C libavutil clean
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
-          ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
-
-clean-vhook:
        $(MAKE) -C vhook clean
+       rm -f *.o *.d *~ .libs gmon.out TAGS \
+          $(PROG) $(PROG_G) $(PROGTEST) $(QTFASTSTART)
 
 # Note well: config.log is NOT removed.
 distclean: clean
-       $(MAKE) -C libavcodec distclean
-       rm -f config.mak config.h
+       $(MAKE) -C libavutil   distclean
+       $(MAKE) -C libavcodec  distclean
+       $(MAKE) -C libavformat distclean
+       $(MAKE) -C tests       distclean
+       $(MAKE) -C vhook       distclean
+       rm -f .depend config.mak config.h *.pc
 
 TAGS:
        etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]