Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing #1767. The problem was that "make all" in gst-plugins depends on "make install" in gstreamer, so "all" and "install" can not be separated.

Browse source
This commit is contained in:
fgerlits 2006-08-24 18:19:52 +00:00
parent f7b36c56ef
commit 0d07f154d6
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
livesupport/src/tools/gstreamer/gstreamer-0.8.10/etc/Makefile.in
View file

@ -65,6 +65,7 @@ pkg_config_path=${libdir}/pkgconfig
USR_DIR=${prefix} USR_DIR=${prefix}
USR_BIN_DIR=${USR_DIR}/bin USR_BIN_DIR=${USR_DIR}/bin
USR_LIB_DIR=${libdir} USR_LIB_DIR=${libdir}
USR_INCLUDE_DIR=${USR_DIR}/include
export PATH:=${USR_BIN_DIR}:${PATH} export PATH:=${USR_BIN_DIR}:${PATH}
export CPPFLAGS=-I${USR_DIR}/include export CPPFLAGS=-I${USR_DIR}/include
@ -83,6 +84,7 @@ ${TMP_DIR}/all.stamp:
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
--with-pkg-config-path=${pkg_config_path} --with-pkg-config-path=${pkg_config_path}
${MAKE} -C ${GSTREAMER_DIR} ${MAKE} -C ${GSTREAMER_DIR}
${MAKE} -C ${GSTREAMER_DIR} install
cd ${GST_PLUGINS_DIR} && \ cd ${GST_PLUGINS_DIR} && \
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
--with-pkg-config-path=${pkg_config_path} \ --with-pkg-config-path=${pkg_config_path} \
@ -90,13 +92,16 @@ ${TMP_DIR}/all.stamp:
--disable-gconf --disable-gconftool \ --disable-gconf --disable-gconftool \
--disable-opengl --disable-opengl
${MAKE} -C ${GST_PLUGINS_DIR} ${MAKE} -C ${GST_PLUGINS_DIR}
${MAKE} -C ${GST_PLUGINS_DIR} install
touch ${TMP_DIR}/all.stamp touch ${TMP_DIR}/all.stamp
install: all ${TMP_DIR}/install.stamp install: all
${TMP_DIR}/install.stamp:
${MAKE} -C ${GSTREAMER_DIR} install uninstall:
${MAKE} -C ${GST_PLUGINS_DIR} install ${RM} ${USR_BIN_DIR}/gst-*
touch ${TMP_DIR}/install.stamp ${RMDIR} ${USR_LIB_DIR}/gstreamer*
${RM} ${USR_LIB_DIR}/libgst*
${RMDIR} ${USR_INCLUDE_DIR}/gstreamer*
clean: clean:
${RM} ${TMP_DIR}/*.stamp ${RM} ${TMP_DIR}/*.stamp