From 735e4a6a6a5112b5caccb7e55841aa0eba50f5cb Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sun, 12 Feb 2012 19:44:31 +0100
Subject: [PATCH] regex: Remove obsolete makefile fragments

The update.sh script doesn't work with current PCRE, so these are obsolete.
---
 glib/update-pcre/Makefile.am   |  2 --
 glib/update-pcre/Makefile.am-1 | 28 ----------------------------
 glib/update-pcre/Makefile.am-2 | 10 ----------
 3 files changed, 40 deletions(-)
 delete mode 100644 glib/update-pcre/Makefile.am-1
 delete mode 100644 glib/update-pcre/Makefile.am-2

diff --git a/glib/update-pcre/Makefile.am b/glib/update-pcre/Makefile.am
index 31171ece3..66943ec94 100644
--- a/glib/update-pcre/Makefile.am
+++ b/glib/update-pcre/Makefile.am
@@ -2,7 +2,5 @@ include $(top_srcdir)/Makefile.decl
 
 EXTRA_DIST += 			\
 	update.sh		\
-	Makefile.am-1		\
-	Makefile.am-2		\
 	digitab.patch		\
 	memory.patch
diff --git a/glib/update-pcre/Makefile.am-1 b/glib/update-pcre/Makefile.am-1
deleted file mode 100644
index 8195460ac..000000000
--- a/glib/update-pcre/Makefile.am-1
+++ /dev/null
@@ -1,28 +0,0 @@
-INCLUDES = \
-	-DG_LOG_DOMAIN=\"GLib-GRegex\" \
-	-DSUPPORT_UCP \
-	-DSUPPORT_UTF8 \
-	-DNEWLINE=-1 \
-	-DMATCH_LIMIT=10000000 \
-	-DMATCH_LIMIT_RECURSION=10000000 \
-	-DMAX_NAME_SIZE=32 \
-	-DMAX_NAME_COUNT=10000 \
-	-DMAX_DUPLENGTH=30000 \
-	-DLINK_SIZE=2 \
-	-DEBCDIC=0 \
-	-DPOSIX_MALLOC_THRESHOLD=10 \
-	-DPCRE_STATIC \
-	$(glib_INCLUDES) \
-	@GLIB_DEBUG_FLAGS@ \
-	-DG_DISABLE_DEPRECATED \
-	-DGLIB_COMPILATION \
-	$(DEPRECATED_FLAGS)\
-	$(WARN_CFLAGS) \
-	$(PCRE_WARN_CFLAGS) \
-	$(DEP_CFLAGS)
-
-noinst_LTLIBRARIES = libpcre.la
-
-libpcre_headers =
-
-libpcre_la_SOURCES = \
diff --git a/glib/update-pcre/Makefile.am-2 b/glib/update-pcre/Makefile.am-2
deleted file mode 100644
index 94d4d3c66..000000000
--- a/glib/update-pcre/Makefile.am-2
+++ /dev/null
@@ -1,10 +0,0 @@
-	$(libpcre_headers)
-
-libpcre_la_LIBADD = $(DEP_LIBS)
-
-libpcre_la_LDFLAGS = -no-undefined
-
-EXTRA_DIST =				\
-		COPYING			\
-		makefile.msc
-