aidecoe 14/07/03 07:49:41 Added: 0_pre20120621-make-var-instead-of-cmd.patch Log: Version bump. Fixed bug #515406 on behalf of ChaosEngine <[email protected]>. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
Revision Changes Path 1.1 media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch?rev=1.1&content-type=text/plain Index: 0_pre20120621-make-var-instead-of-cmd.patch =================================================================== Index: Makefile =================================================================== --- Makefile (revision 150) +++ Makefile (working copy) @@ -63,64 +63,64 @@ chmod 755 $(APP_BINARY) output_autofocus.so: mjpg_streamer.h utils.h - make -C plugins/output_autofocus all + $(MAKE) -C plugins/output_autofocus all cp plugins/output_autofocus/output_autofocus.so . input_testpicture.so: mjpg_streamer.h utils.h - make -C plugins/input_testpicture all + $(MAKE) -C plugins/input_testpicture all cp plugins/input_testpicture/input_testpicture.so . ifeq ($(USE_LIBV4L2),true) input_uvc.so: mjpg_streamer.h utils.h - make -C plugins/input_uvc USE_LIBV4L2=true all + $(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all cp plugins/input_uvc/input_uvc.so . else input_uvc.so: mjpg_streamer.h utils.h - make -C plugins/input_uvc all + $(MAKE) -C plugins/input_uvc all cp plugins/input_uvc/input_uvc.so . endif input_control.so: mjpg_streamer.h utils.h - make -C plugins/input_control all + $(MAKE) -C plugins/input_control all cp plugins/input_control/input_control.so . output_file.so: mjpg_streamer.h utils.h - make -C plugins/output_file all + $(MAKE) -C plugins/output_file all cp plugins/output_file/output_file.so . ifeq ($(WXP_COMPAT),true) output_http.so: mjpg_streamer.h utils.h - make -C plugins/output_http -DWXP_COMPAT all + $(MAKE) -C plugins/output_http -DWXP_COMPAT all cp plugins/output_http/output_http.so . else output_http.so: mjpg_streamer.h utils.h - make -C plugins/output_http all + $(MAKE) -C plugins/output_http all cp plugins/output_http/output_http.so . endif output_udp.so: mjpg_streamer.h utils.h - make -C plugins/output_udp all + $(MAKE) -C plugins/output_udp all cp plugins/output_udp/output_udp.so . input_gspcav1.so: mjpg_streamer.h utils.h - make -C plugins/input_gspcav1 all + $(MAKE) -C plugins/input_gspcav1 all cp plugins/input_gspcav1/input_gspcav1.so . input_file.so: mjpg_streamer.h utils.h - make -C plugins/input_file all + $(MAKE) -C plugins/input_file all cp plugins/input_file/input_file.so . output_rtsp.so: mjpg_streamer.h utils.h - make -C plugins/output_rtsp all + $(MAKE) -C plugins/output_rtsp all cp plugins/output_rtsp/output_rtsp.so . output_ptp2.so: mjpg_streamer.h utils.h - make -C plugins/input_ptp2 all + $(MAKE) -C plugins/input_ptp2 all cp plugins/input_ptp2/input_ptp2.so . #input_http.so: mjpg_streamer.h utils.h -# make -C plugins/input_http all +# $(MAKE) -C plugins/input_http all # cp plugins/input_http/input_http.so . # The viewer plugin requires the SDL library for compilation @@ -129,22 +129,22 @@ # execute the following command: # make output_viewer.so output_viewer.so: mjpg_streamer.h utils.h - make -C plugins/output_viewer all + $(MAKE) -C plugins/output_viewer all cp plugins/output_viewer/output_viewer.so . # cleanup clean: - make -C plugins/input_uvc $@ - make -C plugins/input_testpicture $@ - make -C plugins/output_file $@ - make -C plugins/output_http $@ - make -C plugins/output_udp $@ - make -C plugins/output_autofocus $@ - make -C plugins/input_gspcav1 $@ - make -C plugins/output_viewer $@ - make -C plugins/input_control $@ - make -C plugins/output_rtsp $@ -# make -C plugins/input_http $@ + $(MAKE) -C plugins/input_uvc $@ + $(MAKE) -C plugins/input_testpicture $@ + $(MAKE) -C plugins/output_file $@ + $(MAKE) -C plugins/output_http $@ + $(MAKE) -C plugins/output_udp $@ + $(MAKE) -C plugins/output_autofocus $@ + $(MAKE) -C plugins/input_gspcav1 $@ + $(MAKE) -C plugins/output_viewer $@ + $(MAKE) -C plugins/input_control $@ + $(MAKE) -C plugins/output_rtsp $@ +# $(MAKE) -C plugins/input_http $@ rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo # useful to make a backup "make tgz"
