diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2014-02-03 15:59:18 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2014-02-03 16:07:31 -0800 |
| commit | 4f0084d9d3b8726a797a373c7ec5e406000995d0 (patch) | |
| tree | 8526767cdf5c3b612b68899d1e98b96f79076f3a | |
| parent | 90320817dc06052de780b406ad74db22845835ba (diff) | |
| download | pkg-config-4f0084d9d3b8726a797a373c7ec5e406000995d0.tar.gz | |
glib: Fix Makefiles to suppress warnings from automake
With the newly added glib.mk, some of the noinst_* variables need to use
+= in the evaluation to avoid multiple definition warnings from
automake.
| -rw-r--r-- | glib-patches/no-installed-files.patch | 8 | ||||
| -rw-r--r-- | glib/glib/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/m4macros/Makefile.am | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/glib-patches/no-installed-files.patch b/glib-patches/no-installed-files.patch index f763ffe..7bd579e 100644 --- a/glib-patches/no-installed-files.patch +++ b/glib-patches/no-installed-files.patch @@ -1,5 +1,5 @@ diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am -index 07b0141..c16051d 100644 +index 07b0141..8edc404 100644 --- a/glib/glib/Makefile.am +++ b/glib/glib/Makefile.am @@ -12,7 +12,7 @@ include $(top_srcdir)/glib.mk @@ -27,7 +27,7 @@ index 07b0141..c16051d 100644 glib.rc -lib_LTLIBRARIES = libglib-2.0.la -+noinst_LTLIBRARIES = libglib-2.0.la ++noinst_LTLIBRARIES += libglib-2.0.la if OS_WIN32_AND_DLL_COMPILATION if MS_LIB_AVAILABLE @@ -198,7 +198,7 @@ index 642f75c..abf32cb 100644 charset.alias: config.charset $(AM_V_GEN) $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am -index 971871c..0e6164c 100644 +index 971871c..c91daa8 100644 --- a/glib/m4macros/Makefile.am +++ b/glib/m4macros/Makefile.am @@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4 @@ -206,4 +206,4 @@ index 971871c..0e6164c 100644 m4datadir = $(datadir)/aclocal -m4data_DATA = $(installed_m4) -+noinst_DATA = $(installed_m4) ++noinst_DATA += $(installed_m4) diff --git a/glib/glib/Makefile.am b/glib/glib/Makefile.am index d46e39b..7093f46 100644 --- a/glib/glib/Makefile.am +++ b/glib/glib/Makefile.am @@ -59,7 +59,7 @@ EXTRA_DIST += \ BUILT_EXTRA_DIST += \ glib.rc -noinst_LTLIBRARIES = libglib-2.0.la +noinst_LTLIBRARIES += libglib-2.0.la if OS_WIN32_AND_DLL_COMPILATION if MS_LIB_AVAILABLE diff --git a/glib/m4macros/Makefile.am b/glib/m4macros/Makefile.am index 0e6164c..c91daa8 100644 --- a/glib/m4macros/Makefile.am +++ b/glib/m4macros/Makefile.am @@ -5,4 +5,4 @@ installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4 EXTRA_DIST+=$(installed_m4) m4datadir = $(datadir)/aclocal -noinst_DATA = $(installed_m4) +noinst_DATA += $(installed_m4) |