Commit 651d9e90 authored by Jehan's avatar Jehan

Bug 731013 - cross-compilation broken when building extract-strings

It is actually a bad idea to use noinst_PROGRAMS for build tools,
because it adds a $(EXEEXT). It is best to override the all target
with all-local to trigger the tool build.
parent 40b50083
......@@ -1566,7 +1566,7 @@ distclean-local:
if test $(srcdir) != .; then \
rm -f $(MAINTAINERCLEANFILES); \
rm -rf stock-icons; \
rm -f extract-strings$(EXEEXT); \
rm -f extract-strings$(BUILD_EXEEXT); \
rm -f $(template_headers); \
fi
......
......@@ -114,7 +114,7 @@ templates = \
template_headers = $(templates:.ui=.ui.h)
extract_strings = $(top_builddir)/util/extract-strings
extract_strings = $(top_builddir)/util/extract-strings$(BUILD_EXEEXT)
%.ui.h : %.ui
$(AM_V_GEN) $(extract_strings) $< > $@
......
......@@ -4,10 +4,10 @@ extract_strings_cppflags =
extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
extract-strings$(EXEEXT): $(extract_strings_sources)
@rm -f extract-strings
extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
@rm -f extract-strings$(BUILD_EXEEXT)
$(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
noinst_PROGRAMS = extract-strings
all-local: extract-strings$(BUILD_EXEEXT)
-include $(top_srcdir)/git.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment