util/extract-strings: Use autotools syntax for building

Always refer to it as "extract-strings$(EXEEXT)" where needed to take
cross-compilation into account.

https://bugzilla.gnome.org/show_bug.cgi?id=731013
This commit is contained in:
Rico Tzschichholz 2014-08-15 17:56:39 +02:00 committed by Matthias Clasen
parent f4a29fbfc2
commit 62254ca306
3 changed files with 6 additions and 13 deletions

View File

@ -1336,7 +1336,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
%.ui.h: %.ui %.ui.h: %.ui
$(AM_V_GEN) mkdir -p $(dir $@) \ $(AM_V_GEN) mkdir -p $(dir $@) \
&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@ && $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
# #
# rules to generate built sources # rules to generate built sources
@ -1566,7 +1566,6 @@ distclean-local:
if test $(srcdir) != .; then \ if test $(srcdir) != .; then \
rm -f $(MAINTAINERCLEANFILES); \ rm -f $(MAINTAINERCLEANFILES); \
rm -rf stock-icons; \ rm -rf stock-icons; \
rm -f extract-strings$(EXEEXT); \
rm -f $(template_headers); \ rm -f $(template_headers); \
fi fi

View File

@ -114,10 +114,8 @@ templates = \
template_headers = $(templates:.ui=.ui.h) template_headers = $(templates:.ui=.ui.h)
extract_strings = $(top_builddir)/util/extract-strings
%.ui.h : %.ui %.ui.h : %.ui
$(AM_V_GEN) $(extract_strings) $< > $@ $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
EXTRA_DIST += \ EXTRA_DIST += \
inspector.gresource.xml \ inspector.gresource.xml \

View File

@ -1,13 +1,9 @@
# The extract_strings tool is a build utility that runs on the build system. # The extract_strings tool is a build utility that runs on the build system.
extract_strings_sources = extract-strings.c
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
$(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 noinst_PROGRAMS = extract-strings
extract_strings_SOURCES = extract-strings.c
extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD)
extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD)
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk