Attachment #11477 for bug #19001




	$(MAKE) -C vhook all

install: all $(INSTALLVHOOK)
	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) install
	install -d $(DESTDIR)$(prefix)/bin
	install -s -m 755 $(PROG) $(DESTDIR)$(prefix)/bin
	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib

install-vhook:
	$(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook

$(prefix)/lib/vhook:
	install -d $@

installlib:
	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib

dep:	depend






install: all
ifeq ($(BUILD_SHARED),yes)
	install -d $(DESTDIR)$(prefix)/lib
	install -s -m 755 $(SLIB) $(DESTDIR)$(prefix)/lib/libavcodec-$(VERSION).so
	install -d $(DESTDIR)$(prefix)/include/ffmpeg
	install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
	install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
	install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
endif

installlib: all
	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
	install -d $(DESTDIR)$(prefix)/include/ffmpeg
	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
                $(DESTDIR)$(prefix)/include/ffmpeg

#
# include dependency files if they exist




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

installlib: all
	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
	install -d $(DESTDIR)$(prefix)/include/ffmpeg
	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
                $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
                $(SRC_PATH)/libavformat/rtspcodes.h \
                $(DESTDIR)$(prefix)/include/ffmpeg

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

Lines 26-31 Link Here

(-)../ffmpeg-cvs-2003-03-04.orig/vhook/Makefile (+1 lines)
26	$(CC) -MM $(CFLAGS) $^ 1>.depend	26	$(CC) -MM $(CFLAGS) $^ 1>.depend
27		27
28	install:	28	install:
		29	install -d $(INSTDIR)
29	install -s -m 755 $(HOOKS) $(INSTDIR)	30	install -s -m 755 $(HOOKS) $(INSTDIR)
30		31
31	imlib2.so: imlib2.o	32	imlib2.so: imlib2.o

Return to bug 19001

Lines 84-103 Link Here

(-)../ffmpeg-cvs-2003-03-04.orig/Makefile (-11 / +9 lines)
84	$(MAKE) -C vhook all	84	$(MAKE) -C vhook all
85		85
86	install: all $(INSTALLVHOOK)	86	install: all $(INSTALLVHOOK)
87	$(MAKE) -C libavcodec install	87	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) install
88	install -d $(prefix)/bin	88	install -d $(DESTDIR)$(prefix)/bin
89	install -c -s -m 755 $(PROG) $(prefix)/bin	89	install -s -m 755 $(PROG) $(DESTDIR)$(prefix)/bin
90	ln -sf ffmpeg $(prefix)/bin/ffplay	90	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
		91	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib
91		92
92	install-vhook: $(prefix)/lib/vhook	93	install-vhook:
93	$(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook	94	$(MAKE) -C vhook install INSTDIR=$(DESTDIR)$(prefix)/lib/vhook
94
95	$(prefix)/lib/vhook:
96	install -d $@
97		95
98	installlib:	96	installlib:
99	$(MAKE) -C libavcodec installlib	97	$(MAKE) -C libavcodec DESTDIR=$(DESTDIR) installlib
100	$(MAKE) -C libavformat installlib	98	$(MAKE) -C libavformat DESTDIR=$(DESTDIR) installlib
101		99
102	dep: depend	100	dep: depend
103		101

Lines 197-216 Link Here

(-)../ffmpeg-cvs-2003-03-04.orig/libavcodec/Makefile (-10 / +8 lines)
197		197
198	install: all	198	install: all
199	ifeq ($(BUILD_SHARED),yes)	199	ifeq ($(BUILD_SHARED),yes)
200	install -d $(prefix)/lib	200	install -d $(DESTDIR)$(prefix)/lib
201	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so	201	install -s -m 755 $(SLIB) $(DESTDIR)$(prefix)/lib/libavcodec-$(VERSION).so
202	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so	202	install -d $(DESTDIR)$(prefix)/include/ffmpeg
203	ldconfig \|\| true	203	install -m 644 $(VPATH)/avcodec.h $(DESTDIR)$(prefix)/include/ffmpeg/avcodec.h
204	mkdir -p $(prefix)/include/ffmpeg	204	install -m 644 $(VPATH)/common.h $(DESTDIR)$(prefix)/include/ffmpeg/common.h
205	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
206	install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
207	endif	205	endif
208		206
209	installlib: all	207	installlib: all
210	install -m 644 $(LIB) $(prefix)/lib	208	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
211	mkdir -p $(prefix)/include/ffmpeg	209	install -d $(DESTDIR)$(prefix)/include/ffmpeg
212	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \	210	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h $(SRC_PATH)/libavcodec/common.h \
213	$(prefix)/include/ffmpeg	211	$(DESTDIR)$(prefix)/include/ffmpeg
214		212
215	#	213	#
216	# include dependency files if they exist	214	# include dependency files if they exist

Lines 75-86 Link Here

(-)../ffmpeg-cvs-2003-03-04.orig/libavformat/Makefile (-3 / +3 lines)
75	$(CC) -MM $(CFLAGS) $^ 1>.depend	75	$(CC) -MM $(CFLAGS) $^ 1>.depend
76		76
77	installlib: all	77	installlib: all
78	install -m 644 $(LIB) $(prefix)/lib	78	install -m 644 $(LIB) $(DESTDIR)$(prefix)/lib
79	mkdir -p $(prefix)/include/ffmpeg	79	install -d $(DESTDIR)$(prefix)/include/ffmpeg
80	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \	80	install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
81	$(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \	81	$(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
82	$(SRC_PATH)/libavformat/rtspcodes.h \	82	$(SRC_PATH)/libavformat/rtspcodes.h \
83	$(prefix)/include/ffmpeg	83	$(DESTDIR)$(prefix)/include/ffmpeg
84		84
85	%.o: %.c	85	%.o: %.c
86	$(CC) $(CFLAGS) -c -o $@ $<	86	$(CC) $(CFLAGS) -c -o $@ $<