[vlc-commits] Qt4: install QtXml and QtNetwork

Jean-Baptiste Kempf git at videolan.org
Wed Nov 9 22:44:31 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Nov  9 22:21:13 2011 +0100| [f12f0adb095f5044b33f534bf29dffe7dbf1e71c] | committer: Jean-Baptiste Kempf

Qt4: install QtXml and QtNetwork

Will help package phonon bindings and doesn't cost much since it is
already compiled.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f12f0adb095f5044b33f534bf29dffe7dbf1e71c
---

 contrib/src/qt4/rules.mak |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index c478cbb..cd8177c 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -38,7 +38,7 @@ ifdef HAVE_CROSS_COMPILE
 		$(MAKE) $(XTOOLS)
 endif
 	# INSTALLING LIBRARIES
-	for lib in QtGui QtCore; \
+	for lib in QtGui QtCore QtNetwork QtXml; \
 		do install -D -- $</lib/lib$${lib}.a "$(PREFIX)/lib/lib$${lib}.a"; \
 	done
 	# INSTALLING PLUGINS
@@ -53,6 +53,12 @@ endif
 	# INSTALLING GUI HEADERS
 	cd $</src/gui; find . -type f -name '*.h' -exec install -D -- "{}" "$(PREFIX)/include/qt4/src/gui/{}" \;
 	cd $</include/QtGui; find . -maxdepth 1 -type f \( -name '*.h' -o -name 'Q*' \) -exec install -D -s --strip-program="$(abspath $(SRC)/qt4/fix_header.sh)" -- "{}" "$(PREFIX)/include/qt4/QtGui/{}" \;
+	# INSTALLING XML HEADERS
+	cd $</src/xml;    find . -type f -name '*.h' -exec install -D -- "{}" "$(PREFIX)/include/qt4/src/xml/{}" \;
+	cd $</include/QtXml; find . -maxdepth 1 -type f \( -name '*.h' -o -name 'Q*' \) -exec install -D -s --strip-program="$(abspath $(SRC)/qt4/fix_header.sh)" -- "{}" "$(PREFIX)/include/qt4/QtXml/{}" \;
+	# INSTALLING NETWORK HEADERS
+	cd $</src/network;    find . -type f -name '*.h' -exec install -D -- "{}" "$(PREFIX)/include/qt4/src/network/{}" \;
+	cd $</include/QtNetwork; find . -maxdepth 1 -type f \( -name '*.h' -o -name 'Q*' \) -exec install -D -s --strip-program="$(abspath $(SRC)/qt4/fix_header.sh)" -- "{}" "$(PREFIX)/include/qt4/QtNetwork/{}" \;
 	# INSTALLING PKGCONFIG FILES
 	install -d "$(PREFIX)/lib/pkgconfig"
 	cat $(SRC)/qt4/QtCore.pc.in | sed -e s/@@VERSION@@/$(QT4_VERSION)/ | sed -e 's|@@PREFIX@@|$(PREFIX)|' > "$(PREFIX)/lib/pkgconfig/QtCore.pc"



More information about the vlc-commits mailing list