diff options
author | Christian Persch <chpe@gnome.org> | 2012-02-12 19:44:31 +0100 |
---|---|---|
committer | Christian Persch <chpe@gnome.org> | 2012-02-12 20:12:59 +0100 |
commit | fe7adaa44a63b39d3e1150e7d770dd62191c007f (patch) | |
tree | 49d2dda627ce3cadffdacdd3d17527be8415ab6c | |
parent | a0fd66eb0cb586c0155516d5b9620e232cbb70da (diff) | |
download | glib-fe7adaa44a63b39d3e1150e7d770dd62191c007f.tar.gz |
regex: Remove obsolete makefile fragments
The update.sh script doesn't work with current PCRE, so these are obsolete.
-rw-r--r-- | glib/update-pcre/Makefile.am | 2 | ||||
-rw-r--r-- | glib/update-pcre/Makefile.am-1 | 28 | ||||
-rw-r--r-- | glib/update-pcre/Makefile.am-2 | 10 |
3 files changed, 0 insertions, 40 deletions
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 - |