OSDN Git Service

regex: Remove obsolete makefile fragments
authorChristian Persch <chpe@gnome.org>
Sun, 12 Feb 2012 18:44:31 +0000 (19:44 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 27 Feb 2012 03:09:04 +0000 (22:09 -0500)
The update.sh script doesn't work with current PCRE, so these are obsolete.

glib/update-pcre/Makefile.am
glib/update-pcre/Makefile.am-1 [deleted file]
glib/update-pcre/Makefile.am-2 [deleted file]

index 31171ec..66943ec 100644 (file)
@@ -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 (file)
index 8195460..0000000
+++ /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 (file)
index 94d4d3c..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-       $(libpcre_headers)
-
-libpcre_la_LIBADD = $(DEP_LIBS)
-
-libpcre_la_LDFLAGS = -no-undefined
-
-EXTRA_DIST =                           \
-               COPYING                 \
-               makefile.msc
-