Commit cf980596 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/regexrepl.c removed here ...

2001-07-12  Sven Neumann  <sven@gimp.org>

	* app/regexrepl.c
	* app/regexrepl.h: removed here ...

	* plug-ins/script-fu/regexrepl.c
	* plug-ins/script-fu/regexrepl.h: ... and here ...

	* regexrepl/Makefile.am
	* regexrepl/regex.c
	* regexrepl/regex.h: ... and added here again.

	* Makefile.am
	* configure.in
	* app/Makefile.am
	* app/pdb/plug_in_cmds.c
	* app/pdb/procedural_db_cmds.c
	* plug-ins/script-fu/Makefile.am
	* plug-ins/script-fu/interp_regex.c
	* tools/pdbgen/app.pl
	* tools/pdbgen/pdb/plug_in.pdb
	* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
parent 7aff6c8f
2001-07-12 Sven Neumann <sven@gimp.org>
* app/regexrepl.c
* app/regexrepl.h: removed here ...
* plug-ins/script-fu/regexrepl.c
* plug-ins/script-fu/regexrepl.h: ... and here ...
* regexrepl/Makefile.am
* regexrepl/regex.c
* regexrepl/regex.h: ... and added here again.
* Makefile.am
* configure.in
* app/Makefile.am
* app/pdb/plug_in_cmds.c
* app/pdb/procedural_db_cmds.c
* plug-ins/script-fu/Makefile.am
* plug-ins/script-fu/interp_regex.c
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
2001-07-12 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
......
## Process this file with automake to produce Makefile.in
SUBDIRS = \
tools \
intl \
libgimpbase \
libgimpcolor \
libgimpmath \
libgimpwidgets \
libgimp \
app \
$(GIMP_PLUGINS) \
$(GIMP_MODULES) \
po \
po-libgimp \
po-plug-ins \
$(GIMP_PERL_PO) \
po-script-fu \
cursors \
pixmaps \
data \
tips \
docs \
devel-docs \
tools \
intl \
regexrepl \
libgimpbase \
libgimpcolor \
libgimpmath \
libgimpwidgets \
libgimp \
app \
$(GIMP_PLUGINS) \
$(GIMP_MODULES) \
po \
po-libgimp \
po-plug-ins \
$(GIMP_PERL_PO) \
po-script-fu \
cursors \
pixmaps \
data \
tips \
docs \
devel-docs \
build
bin_SCRIPTS = gimptool-1.4 @GIMPINSTALL@
......
......@@ -4,14 +4,6 @@ SUBDIRS = paint-funcs base core pdb xcf tools widgets gui
scriptdata =
if HAVE_GLIBC_REGEX
regex_sources =
else
regex_sources = \
regexrepl.c \
regexrepl.h
endif
bin_PROGRAMS = gimp
gimp_SOURCES = @STRIP_BEGIN@ \
......@@ -127,7 +119,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
gimphelp.h \
libgimp_glue.c \
libgimp_glue.h \
$(regex_sources) \
@STRIP_END@
EXTRA_DIST = \
......@@ -138,16 +129,19 @@ EXTRA_DIST = \
gimp.sym \
wilber.ico \
arch/i386/mmx/detect_mmx.S \
arch/i386/mmx/paint_funcs_mmx.S \
regexrepl.c \
regexrepl.h
arch/i386/mmx/paint_funcs_mmx.S
if HAVE_GLIBC_REGEX
REGEXREPL =
else
REGEXREPL = $(top_builddir)/regexrepl/libregex.a
endif
gimp_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLIBDIR=\""$(gimpplugindir)"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-DREGEX_MALLOC \
-DG_LOG_DOMAIN=\"Gimp\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
......@@ -177,6 +171,7 @@ gimp_LDADD = @STRIP_BEGIN@ \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) \
$(REGEXREPL) \
@STRIP_END@
.PHONY: files
......
......@@ -36,7 +36,7 @@
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#include "regexrepl/regex.h"
#endif
......
......@@ -36,7 +36,7 @@
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#include "regexrepl/regex.h"
#endif
......
......@@ -900,6 +900,7 @@ plug-ins/perl/po/Makefile.in
po-plug-ins/Makefile.in
po-script-fu/Makefile.in
intl/Makefile
regexrepl/Makefile
tools/Makefile
tools/authorsgen/Makefile
tools/pdbgen/Makefile
......
## Process this file with automake to produce Makefile.in
if HAVE_GLIBC_REGEX
regex_sources =
else
regex_sources = regexrepl.c regexrepl.h
endif
SUBDIRS = scripts
libexecdir = $(gimpplugindir)/plug-ins
......@@ -30,18 +24,9 @@ script_fu_SOURCES = @STRIP_BEGIN@ \
script-fu-enums.h \
siod.h \
siodp.h \
$(regex_sources) \
@STRIP_END@
EXTRA_DIST = @STRIP_BEGIN@ \
regexrepl.c \
regexrepl.h \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DREGEX_MALLOC \
-DLOCALEDIR=\""$(localedir)"\" \
@STRIP_END@
AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\"
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
......@@ -50,6 +35,12 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(includedir) \
@STRIP_END@
if HAVE_GLIBC_REGEX
REGEXREPL =
else
REGEXREPL = $(top_builddir)/regexrepl/libregex.a
endif
LDADD = @STRIP_BEGIN@ \
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
$(top_builddir)/libgimp/libgimpui-$(LT_RELEASE).la \
......@@ -59,6 +50,7 @@ LDADD = @STRIP_BEGIN@ \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(INTLLIBS) \
$(REGEXREPL) \
@STRIP_END@
.PHONY: files
......
......@@ -6,7 +6,7 @@
#include <string.h>
#ifndef HAVE_GLIBC_REGEX
#include "regexrepl.h"
#include "regexrepl/regex.h"
#else
#include <regex.h>
#endif
......
This diff is collapsed.
This diff is collapsed.
......@@ -6,7 +6,7 @@
#include <string.h>
#ifndef HAVE_GLIBC_REGEX
#include "regexrepl.h"
#include "regexrepl/regex.h"
#else
#include <regex.h>
#endif
......
Makefile.in
Makefile
.deps
noinst_LIBRARIES = libregex.a
if HAVE_GLIBC_REGEX
libregex_a_SOURCES =
else
libregex_a_SOURCES = regex.c regex.h
endif
INCLUDES = \
-I$(top_srcdir) \
-I$(includedir)
AM_CPPFLAGS = \
-DREGEX_MALLOC
EXTRA_DIST = \
regex.c \
regex.h
......@@ -160,7 +160,7 @@ init_syntax_once ()
#endif /* not emacs */
/* Get the interface, including the syntax bits. */
#include "regexrepl.h"
#include "regexrepl/regex.h"
/* isalpha etc. are used for the character classes. */
#include <ctype.h>
......
......@@ -734,7 +734,7 @@ GPL
$headers .= "\n" if /libgimp/ && !$lib++ && $headers;
if ($_ eq '"regexrepl.h"') {
if ($_ eq '"regexrepl/regex.h"') {
$headers .= "\n";
$headers .= "#ifdef HAVE_GLIBC_REGEX\n";
$headers .= "#include <regex.h>\n";
......@@ -743,7 +743,7 @@ GPL
$headers .= "#include $_\n";
if ($_ eq '"regexrepl.h"') {
if ($_ eq '"regexrepl/regex.h"') {
$headers .= "#endif\n\n";
}
......
......@@ -333,7 +333,8 @@ CODE
}
@headers = qw("plug_in.h" "regexrepl.h" "appenv.h" <string.h> <stdlib.h>);
@headers = qw("plug_in.h" "regexrepl/regex.h" "appenv.h"
<string.h> <stdlib.h>);
$extra{app}->{code} = <<'CODE';
static int
......
......@@ -181,7 +181,7 @@ HELP
);
%invoke = (
headers => [ qw(<stdlib.h> "regexrepl.h") ],
headers => [ qw(<stdlib.h> "regexrepl/regex.h") ],
vars => [ 'PDBQuery pdb_query' ],
code => <<CODE
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment