From: Colin Walters <walters@verbum.org>
Date: Tue, 26 Jun 2012 14:13:28 +0000 (-0400)
Subject: Revert "make dist fix"
X-Git-Tag: LIBSOUP_2_39_4~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7a51af6ef95e6e7087d7144c17ffa5ea224d0d3;p=platform%2Fupstream%2Flibsoup.git

Revert "make dist fix"

This reverts commit 76cc02212e63f692e6e36bdf99987928dc3c2ed2.  After
discussion with Dan on IRC, we agreed to revert this for now until a
better solution is written.  Probably one of

1) Rewrite tld-parser in a scripting language, so it doesn't have
   a build process
2) Hack somewhere else in automake to make 'make dist' happy
---

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index c337b7f..9b936a9 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -180,7 +180,7 @@ tld_parser_LDADD = $(GLIB_LIBS)
 
 TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
 
-tld_data.inc: $(TLD_DATA_FILE)
+tld_data.inc: tld-parser $(TLD_DATA_FILE)
 	$(builddir)/tld-parser $(TLD_DATA_FILE) $(srcdir)/tld_data.inc
 
 if BUILD_LIBSOUP_GNOME