|
Description
Hib Eris
2014-05-29 12:21:51 UTC
Created attachment 100105 [details] [review] Replace use of INCLUDES with AM_CPPFLAGS in every Makefile.am Can you point to somewhere that says that INCLUDES is deprecated? http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html INCLUDES This does the same job as AM_CPPFLAGS (or any per-target _CPPFLAGS variable if it is used). It is an older name for the same functionality. This variable is deprecated; we suggest using AM_CPPFLAGS and per-target _CPPFLAGS instead. Also when you run autogen.sh: $ ./autogen.sh Checking for automake >= 1.7... Testing automake-1.14... not found. Testing automake-1.13... found 1.13.3 Running autoreconf -v -i ... autoreconf: Entering directory `.' autoreconf: configure.ac: not using Gettext autoreconf: running: aclocal -I m4 autoreconf: configure.ac: tracing autoreconf: running: libtoolize --copy autoreconf: running: /usr/bin/autoconf autoreconf: running: /usr/bin/autoheader autoreconf: running: automake --add-missing --copy --no-force cpp/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') cpp/tests/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') fofi/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') glib/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') glib/demo/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') glib/reference/Makefile.am:70: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') goo/Makefile.am:43: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') poppler/Makefile.am:123: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') qt4/demos/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') qt4/src/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') qt4/tests/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') parallel-tests: installing './test-driver' qt5/demos/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') qt5/src/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') qt5/tests/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') splash/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') test/Makefile.am:36: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') utils/Makefile.am:13: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') autoreconf: Leaving directory `.' Instead of just replacing INCLUDES with AM_CPPFLAGS everywhere we could use target CPPFLAGS, libpoppler_cpp_la_CPPFLAGS, libpoppler_la_CPPFLAGS, etc. I think it's more consistent with other flags, sources, etc. Agree with Carlos, Hib, can you do that? (In reply to comment #5) > Agree with Carlos, Hib, can you do that? Yes, using taget_CPPFLAGS is much more consistent and cleaner. It will however also cause some more changes to the Makefile.am's than a simple find and replace. I will work on a patch for this. I've made a series of patches to replace INCLUDES with target_CPPFLAGS.
While doing this, I also did a lot of cleanup in the Makefile.am's to make them more uniform by using target_{SOURCES, CPPFLAGS, CFLAGS, LDFLAGS, LDADD} and by reshuffeling the code to always start the Makefile.am with global variables, with the target specific variables after those.
This made the patches rather large, but I hope you like the result anyway.
Created attachment 100538 [details] [review] Cleanup cpp/Makefile.am Created attachment 100539 [details] [review] Cleanup cpp/tests/Makefile.am Created attachment 100540 [details] [review] Cleanup fofi/Makefile.am Created attachment 100541 [details] [review] Cleanup glib/Makefile.am Created attachment 100542 [details] [review] Cleanup glib/demo/Makefile.am Created attachment 100543 [details] [review] Cleanup glib/reference/Makefile.am Created attachment 100544 [details] [review] Cleanup goo/Makefile.am Created attachment 100545 [details] [review] Cleanup qt4/demos/Makefile.am Created attachment 100546 [details] [review] Cleanup qt4/src/Makefile.am Created attachment 100547 [details] [review] Cleanup qt4/tests/Makefile.am Created attachment 100548 [details] [review] Cleanup qt5/demos/Makefile.am Created attachment 100549 [details] [review] Cleanup qt5/src/Makefile.am Created attachment 100550 [details] [review] Cleanup qt5/tests/Makefile.am Created attachment 100551 [details] [review] Cleanup splash/Makefile.am Created attachment 100552 [details] [review] Add cairo dependencies to GTK_TEST in configure Created attachment 100553 [details] [review] Cleanup test/Makefile.am Created attachment 100554 [details] [review] Cleanup utils/Makefile.am Created attachment 100555 [details] [review] Replace INCLUDES with target_CPPFLAGS in poppler/Makefile.am Created attachment 100556 [details] [review] Remove cairo_sources from poppler/Makefile.am This should have been removed with 50ecfadab36a9769b09e4c2c1670d86448a0e1ee. Created attachment 100557 [details] [review] Remove unused variable cairo_libs from poppler/Makefile.am This should have been removed with d46553d696b2d7fe416ce8db40db54dd1d7c6733. Created attachment 100558 [details] [review] Cleanup poppler/Makefile.am You can fetch these patches from my public git repository with: git fetch git://gitorious.org/hiberis/poppler.git bfo-79411 && git checkout -b bfo-79411 FETCH_HEAD Can you please give me a single patch? I don't want to click 20 times to see the patches when all of them are "Fixing Makefile.am" stuff and can easily share the same commit. Created attachment 103283 [details] [review] Fixing Makefile.am Pushed, thanks *** Bug 86742 has been marked as a duplicate of this bug. *** |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.