Commit 3aae3940 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/base/Makefile.am automake-1.6 seems to use yet another variable to

2002-06-08  Sven Neumann  <sven@gimp.org>

	* app/base/Makefile.am
	* app/paint-funcs/Makefile.am: automake-1.6 seems to use yet another
	variable to pass flags to the assembler (bug #84514). Define
	AM_CCASFLAGS like AM_ASFLAGS to satisfy all versions of automake.

	* configure.in
	* all Makefiles: removed STRIP_BEGIN and STRIP_END since it's a
	GNU make extension that we don't really need and newer versions of
	automake don't seem to like it.
parent f064fa4e
2002-06-08 Sven Neumann <sven@gimp.org>
* app/base/Makefile.am
* app/paint-funcs/Makefile.am: automake-1.6 seems to use yet another
variable to pass flags to the assembler (bug #84514). Define
AM_CCASFLAGS like AM_ASFLAGS to satisfy all versions of automake.
* configure.in
* all Makefiles: removed STRIP_BEGIN and STRIP_END since it's a
GNU make extension that we don't really need and newer versions of
automake don't seem to like it.
2002-06-07 Michael Natterer <mitch@gimp.org>
* app/core/gimplist.[ch]: added gimp_list_reverse().
......
......@@ -14,12 +14,12 @@ fine GNU mirrors. Beta software can be found at alpha.gnu.org.
Available from http://www.freedesktop.org/software/pkgconfig/.
- intltoolize 0.17 (or newer version)
- intltoolize 0.17 (or a newer version)
Available from ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/.
These are the additional requirements if you want to compile from CVS.
The file INSTALL lists the various libraries we depend on.
These are only the additional requirements if you want to compile from
CVS. The file INSTALL lists the various libraries we depend on.
Compilation
......@@ -65,7 +65,7 @@ server:
$ cvs -z3 checkout <module>
The interesting module are: glib, atk, pango, gtk+, libart_lgpl,
intltool, gtk-doc
intltool, gtk-doc, gtkhtml2
Patches
......
......@@ -71,12 +71,11 @@ stuff_sources = \
libgimp_glue.c \
libgimp_glue.h
gimp_1_3_SOURCES = @STRIP_BEGIN@ \
gimp_1_3_SOURCES = \
$(gui_sources) \
$(core_ui_sources) \
$(bye_sources) \
$(stuff_sources) \
@STRIP_END@
$(stuff_sources)
EXTRA_DIST = \
makefile.mingw \
......@@ -96,19 +95,17 @@ endif
gimp_1_3_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gimp\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
$(GTK_CFLAGS) \
-I$(includedir)
gimp_1_3_LDADD = @STRIP_BEGIN@ \
gimp_1_3_LDADD = \
gui/libappgui.a \
display/libappdisplay.a \
tools/libapptools.a \
......@@ -134,8 +131,7 @@ gimp_1_3_LDADD = @STRIP_BEGIN@ \
$(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \
$(INTLLIBS) \
$(REGEXREPL) \
@STRIP_END@
$(REGEXREPL)
install-exec-hook:
if DEFAULT_BINARY
......
......@@ -8,7 +8,7 @@ else
mmx_sources =
endif
libappbase_a_SOURCES = @STRIP_BEGIN@ \
libappbase_a_SOURCES = \
base.c \
base.h \
base-enums.c \
......@@ -47,28 +47,28 @@ libappbase_a_SOURCES = @STRIP_BEGIN@ \
tile-manager-crop.c \
tile-manager-crop.h \
tile-swap.c \
tile-swap.h \
@STRIP_END@
tile-swap.h
EXTRA_DIST = \
makefile.msc
EXTRA_DIST = makefile.msc
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
# for automake-1.5
AM_ASFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/app
INCLUDES = @STRIP_BEGIN@ \
# for automake-1.6
AM_CCASFLAGS = AM_ASFLAGS
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
-I$(includedir)
#
# rules to generate built sources
......
......@@ -2,7 +2,7 @@
noinst_LIBRARIES = libappconfig.a
libappconfig_a_SOURCES = @STRIP_BEGIN@ \
libappconfig_a_SOURCES = \
gimpconfig.c \
gimpconfig.h \
gimpconfig-deserialize.c \
......@@ -29,21 +29,18 @@ libappconfig_a_SOURCES = @STRIP_BEGIN@ \
gimprc.c \
gimprc.h \
gimpscanner.c \
gimpscanner.h \
@STRIP_END@
gimpscanner.h
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Config\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir)
#
......@@ -54,17 +51,15 @@ TESTS = test-config
EXTRA_PROGRAMS = test-config
test_config_DEPENDENCIES = @STRIP_BEGIN@ \
test_config_DEPENDENCIES = \
libappconfig.a \
../base/libappbase.a \
../core/libappcore.a \
../display/libappdisplay.a \
../widgets/libappwidgets.a \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la \
@STRIP_END@
$(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la
test_config_LDADD = @STRIP_BEGIN@ \
test_config_LDADD = \
$(GLIB_LIBS) \
$(test_config_DEPENDENCIES) \
@STRIP_END@
$(test_config_DEPENDENCIES)
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Core\" \
-DGIMP_COMPILATION \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(LIBART_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(LIBART_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappcore.a
libappcore_a_sources = @STRIP_BEGIN@ \
libappcore_a_sources = \
core-enums.h \
core-types.h \
cpercep.c \
......@@ -161,18 +159,15 @@ libappcore_a_sources = @STRIP_BEGIN@ \
gimpundostack.c \
gimpundostack.h \
gimpviewable.c \
gimpviewable.h \
@STRIP_END@
gimpviewable.h
libappcore_a_built_sources = @STRIP_BEGIN@ \
core-enums.c \
gimpmarshal.c \
gimpmarshal.h \
@STRIP_END@
libappcore_a_built_sources = \
core-enums.c \
gimpmarshal.c \
gimpmarshal.h
libappcore_a_extra_sources = @STRIP_BEGIN@ \
gimpmarshal.list \
@STRIP_END@
libappcore_a_extra_sources = \
gimpmarshal.list
libappcore_a_SOURCES = $(libappcore_a_built_sources) $(libappcore_a_sources)
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gimp-Display\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Display\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappdisplay.a
libappdisplay_a_sources = @STRIP_BEGIN@ \
libappdisplay_a_sources = \
display-enums.h \
display-types.h \
gimpdisplay.c \
......@@ -54,8 +52,7 @@ libappdisplay_a_sources = @STRIP_BEGIN@ \
gimpprogress.c \
gimpprogress.h \
gimpstatusbar.c \
gimpstatusbar.h \
@STRIP_END@
gimpstatusbar.h
libappdisplay_a_built_sources = display-enums.c
......
......@@ -2,24 +2,21 @@
noinst_LIBRARIES = libappfile.a
libappfile_a_SOURCES = @STRIP_BEGIN@ \
libappfile_a_SOURCES = \
file-open.c \
file-open.h \
file-save.c \
file-save.h \
file-utils.c \
file-utils.h \
@STRIP_END@
file-utils.h
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-File\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
......@@ -2,7 +2,7 @@
noinst_LIBRARIES = libappgui.a
libappgui_a_SOURCES = @STRIP_BEGIN@ \
libappgui_a_SOURCES = \
about-dialog.c \
about-dialog.h \
authors.h \
......@@ -124,24 +124,19 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
vectors-commands.c \
vectors-commands.h \
view-commands.c \
view-commands.h \
@STRIP_END@
view-commands.h
EXTRA_DIST = @STRIP_BEGIN@ \
makefile.msc \
@STRIP_END@
EXTRA_DIST = makefile.msc
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GUI\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
......@@ -8,32 +8,33 @@ else
mmx_sources =
endif
libapppaint_funcs_a_SOURCES = @STRIP_BEGIN@ \
libapppaint_funcs_a_SOURCES = \
paint-funcs-types.h \
paint-funcs.c \
paint-funcs.h \
paint-funcs-generic.h \
paint-funcs-mmx.h \
$(mmx_sources) \
@STRIP_END@
$(mmx_sources)
EXTRA_DIST = \
makefile.msc \
paint-funcs-simd.S
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint-Funcs\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
# for automake-1.5
AM_ASFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/app
INCLUDES = @STRIP_BEGIN@ \
# for automake-1.6
AM_CCASFLAGS = AM_ASFLAGS
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GLIB_CFLAGS) \
-I$(includedir) \
@STRIP_END@
-I$(includedir)
......@@ -2,52 +2,49 @@
noinst_LIBRARIES = libapppaint.a
libapppaint_a_SOURCES = @STRIP_BEGIN@ \
paint-enums.h \
paint-enums.c \
paint-types.h \
paint.c \
paint.h \
gimpairbrush.c \
gimpairbrush.h \
gimpclone.c \
gimpclone.h \
gimpconvolve.c \
gimpconvolve.h \
gimpdodgeburn.c \
gimpdodgeburn.h \
gimperaser.c \
gimperaser.h \
gimppaintcore.c \
gimppaintcore.h \
gimppaintcore-kernels.h \
gimppaintcore-stroke.c \
gimppaintcore-stroke.h \
gimppaintoptions.c \
gimppaintoptions.h \
gimppencil.c \
gimppencil.h \
gimppaintbrush.c \
gimppaintbrush.h \
gimpsmudge.c \
gimpsmudge.h \
@STRIP_END@
libapppaint_a_SOURCES = \
paint-enums.h \
paint-enums.c \
paint-types.h \
paint.c \
paint.h \
gimpairbrush.c \
gimpairbrush.h \
gimpclone.c \
gimpclone.h \
gimpconvolve.c \
gimpconvolve.h \
gimpdodgeburn.c \
gimpdodgeburn.h \
gimperaser.c \
gimperaser.h \
gimppaintcore.c \
gimppaintcore.h \
gimppaintcore-kernels.h \
gimppaintcore-stroke.c \
gimppaintcore-stroke.h \
gimppaintoptions.c \
gimppaintoptions.h \
gimppencil.c \
gimppencil.h \
gimppaintbrush.c \
gimppaintbrush.h \
gimpsmudge.c \
gimpsmudge.h
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Paint\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir)
#
# rules to generate built sources
......
......@@ -2,7 +2,7 @@
noinst_LIBRARIES = libapppdb.a
libapppdb_a_SOURCES = @STRIP_BEGIN@ \
libapppdb_a_SOURCES = \
internal_procs.c \
internal_procs.h \
procedural_db.c \
......@@ -44,21 +44,18 @@ libapppdb_a_SOURCES = @STRIP_BEGIN@ \
text_tool_cmds.c \
transform_tools_cmds.c \
undo_cmds.c \
unit_cmds.c \
@STRIP_END@
unit_cmds.c
## This is a truly ugly hack
libapppdb_a_LIBADD = ../gui/pattern-select.o ../gui/brush-select.o
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Plug-In\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappplug-in.a
libappplug_in_a_SOURCES = @STRIP_BEGIN@ \
libappplug_in_a_SOURCES = \
plug-in-types.h \
plug-in.c \
plug-in.h \
......@@ -30,5 +28,4 @@ libappplug_in_a_SOURCES = @STRIP_BEGIN@ \
plug-in-progress.c \
plug-in-progress.h \
plug-in-rc.c \
plug-in-rc.h \
@STRIP_END@
plug-in-rc.h
......@@ -2,7 +2,7 @@
noinst_LIBRARIES = libapptools.a
libapptools_a_SOURCES = @STRIP_BEGIN@ \
libapptools_a_SOURCES = \
tools-types.h \
tools.c \
tools.h \
......@@ -105,7 +105,6 @@ libapptools_a_SOURCES = @STRIP_BEGIN@ \
gimptransformtool.h \
gimpvectortool.c \
gimpvectortool.h \
\
transform_options.c \
transform_options.h \
paint_options.c \
......@@ -114,29 +113,25 @@ libapptools_a_SOURCES = @STRIP_BEGIN@ \
selection_options.h \
tool_options.c \
tool_options.h \
\
tool_manager.c \
tool_manager.h \
path_tool.h \
path_tool.c \
path_toolP.h \
@STRIP_END@
path_toolP.h
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Tools\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir)
#
# rules to generate built sources
......
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Vectors\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappvectors.a
libappvectors_a_sources = @STRIP_BEGIN@ \
vectors-types.h \
gimpanchor.h \
gimpbezierstroke.h \
gimpbezierstroke.c \
gimpstroke.h \
gimpstroke.c \
gimpvectors.c \
gimpvectors.h \
gimpvectors-preview.c \
gimpvectors-preview.h \
@STRIP_END@
libappvectors_a_SOURCES = $(libappvectors_a_sources)
libappvectors_a_SOURCES = \
vectors-types.h \
gimpanchor.h \
gimpbezierstroke.h \
gimpbezierstroke.c \
gimpstroke.h \
gimpstroke.c \
gimpvectors.c \
gimpvectors.h \
gimpvectors-preview.c \
gimpvectors-preview.h
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = @STRIP_BEGIN@ \
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Widgets\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \
@STRIP_END@
@GIMP_MP_FLAGS@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir) \
@STRIP_END@
INCLUDES = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(PANGOFT2_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappwidgets.a
libappwidgets_a_sources = @STRIP_BEGIN@ \
libappwidgets_a_sources = \
widgets-enums.h \
widgets-types.h \
gimpbrusheditor.c \
......@@ -152,14 +150,12 @@ libappwidgets_a_sources = @STRIP_BEGIN@ \
gtkhwrapbox.c \
gtkhwrapbox.h \
gtkvwrapbox.c \