Move qt4/dialogs/about.hpp to include/vlc_about.h so all interfaces modules can use it.

The change in configure.ac is suboptimal. It would be better to change DEFAULT_INCLUDES to use -I${top_builddir}/include rather than -I${top_builddir}. Automake wizard requested.

diff --git a/configure.ac b/configure.ac
index 51d884640ca510bf2b78dddef4f5df7786440b13..1f5135d69fa2d34a36a71c32aa759326fc901607 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6057,7 +6057,7 @@ dnl  Handle substvars that use $(top_srcdir)
 dnl
 VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
 AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
+CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
 
 dnl
 dnl  Restore *FLAGS

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 28dce7d9230215778ce5cbca4a6f1ac74c111f1c..4358bf5ce5b69dea80e79e81b10a3bede73ae013 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -10,7 +10,6 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-CLEANFILES += dialogs/about.hpp
 SUFFIXES += .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
@@ -63,7 +62,7 @@ nodist_SOURCES_qt4 = \
                ui/sout.h
 
 if ENABLE_QT4
-BUILT_SOURCES += $(nodist_SOURCES_qt4) dialogs/about.hpp
+BUILT_SOURCES += $(nodist_SOURCES_qt4)
 endif
 
 resources.cpp: res.qrc
@@ -80,21 +79,7 @@ resources.cpp: res.qrc
        sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
        rm -f $@.tmp
 
-dialogs/help.cpp: dialogs/about.hpp
-
-dialogs/about.hpp: Modules.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
-       mkdir -p -- dialogs
-       echo "/* Automatically generated file - DO NOT EDIT */" > dialogs/about.hpp.tmp
-       echo "static const char psz_license[] =" >> dialogs/about.hpp.tmp
-       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       echo "static const char psz_thanks[] =" >> dialogs/about.hpp.tmp
-       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       echo "static const char psz_authors[] =" >> dialogs/about.hpp.tmp
-       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
-       echo ";" >> dialogs/about.hpp.tmp
-       mv -f -- dialogs/about.hpp.tmp dialogs/about.hpp
+dialogs/help.cpp: $(top_builddir)/include/vlc_about.h
 
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
@@ -142,7 +127,6 @@ noinst_HEADERS = \
        dialogs/preferences.hpp \
        dialogs/interaction.hpp \
        dialogs/sout.hpp \
-       dialogs/about.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/open.hpp \

diff --git a/src/Makefile.am b/src/Makefile.am
index 58ca6f737c409342101c322a2290aa459f3faaed..99f6e0c90bdeb03825bc6834c76169fc23cf5753 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
-BUILT_SOURCES = modules/builtin.h misc/revision.c
+BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
 ###############################################################################
@@ -112,6 +112,20 @@ endif
 
 modules/modules.c: modules/builtin.h
 
+../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
+       rm -f -- "$@.tmp"
+       mkdir -p -- ../include
+       echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp"
+       echo "static const char psz_license[] =" >> "$@.tmp"
+       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       echo "static const char psz_thanks[] =" >> "$@.tmp"
+       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       echo "static const char psz_authors[] =" >> "$@.tmp"
+       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       mv -f -- "$@.tmp" "$@"
 ###############################################################################
 # Building libvlc
 ###############################################################################