[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 1/3] maint: Drop unused GETTEXT_CPPFLAGS variable



Commit c0a8ea45 removed the use of gettextize, and the setting of
GETTEXT_CPPFLAGS, but did not scrub the now-unused variable from
Makefile.am snippets.

Signed-off-by: Eric Blake <eblake redhat com>
---
 gnulib/lib/Makefile.am   | 2 --
 gnulib/tests/Makefile.am | 2 --
 src/Makefile.am          | 4 ++--
 tests/Makefile.am        | 2 +-
 tools/Makefile.am        | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index f098e823be..601f74073c 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -26,5 +26,3 @@ SUFFIXES =
 noinst_LTLIBRARIES =

 include gnulib.mk
-
-INCLUDES = -I$(top_srcdir) $(GETTEXT_CPPFLAGS)
diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
index df4af59a82..7062cbaf87 100644
--- a/gnulib/tests/Makefile.am
+++ b/gnulib/tests/Makefile.am
@@ -18,8 +18,6 @@

 include gnulib.mk

-INCLUDES = $(GETTEXT_CPPFLAGS)
-
 GNULIB_TESTS0 =
 GNULIB_TESTS1 = $(GNULIB_TESTS)
 if WITH_EXPENSIVE_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index e2b89e27e8..3ac6dcad16 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ abs_topsrcdir = $(shell cd $(top_srcdir) && pwd)

 # No libraries with the exception of LIBXML should be listed
 # here. List them against the individual XXX_la_CFLAGS targets
-# that actually use them. Also keep GETTEXT_CPPFLAGS at the end.
+# that actually use them.
 INCLUDES =	-I../gnulib/lib \
 		-I$(top_srcdir)/gnulib/lib \
 		-I$(top_srcdir) \
@@ -35,7 +35,7 @@ INCLUDES =	-I../gnulib/lib \
 		-DIN_LIBVIRT \
 		-Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \
 		-Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \
-		$(GETTEXT_CPPFLAGS)
+		$(NULL)

 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3b413dca43..69dd45728d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,7 @@ INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir)/src/conf \
-	$(GETTEXT_CPPFLAGS)
+	$(NULL)

 WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1dc009c4fb..fadd09977e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/util \
 	-I$(top_srcdir) \
-	$(GETTEXT_CPPFLAGS)
+	$(NULL)

 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)

-- 
2.20.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]