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

This reverts commit 651d9e90e7.

The commit broke 'make dist' - the extract-strings sources are no
longer included in the tarball.

gtk/Makefile.am

@@ -1566,7 +1566,7 @@ distclean-local:
 	if test $(srcdir) != .; then \
 	  rm -f $(MAINTAINERCLEANFILES); \
 	  rm -rf stock-icons; \
-	  rm -f extract-strings$(BUILD_EXEEXT); \
+	  rm -f extract-strings$(EXEEXT); \
 	  rm -f $(template_headers); \
 	fi
 

gtk/inspector/Makefile.am

@@ -114,7 +114,7 @@ templates = 				\
 
 template_headers = $(templates:.ui=.ui.h)
 
-extract_strings = $(top_builddir)/util/extract-strings$(BUILD_EXEEXT)
+extract_strings = $(top_builddir)/util/extract-strings
 
 %.ui.h : %.ui 
 	$(AM_V_GEN) $(extract_strings) $< > $@

util/Makefile.am

@@ -4,10 +4,10 @@ extract_strings_cppflags =
 extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
 extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
 
-extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
-	@rm -f extract-strings$(BUILD_EXEEXT)
+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 $@
 
-all-local: extract-strings$(BUILD_EXEEXT)
+noinst_PROGRAMS = extract-strings
 
 -include $(top_srcdir)/git.mk