From 1417a996d4eccddfe79a550760e77f74af2b4883 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 4 Jan 1998 03:36:46 +0000 Subject: [PATCH] Fixed srcdir builddir makefile confusion -Yosh --- configure.in | 2 +- docs/Makefile.am | 5 ++--- plug-ins/deinterlace/Makefile.am | 4 ++-- plug-ins/emboss/Makefile.am | 4 ++-- plug-ins/hot/Makefile.am | 4 ++-- plug-ins/nlfilt/Makefile.am | 4 ++-- plug-ins/sinus/Makefile.am | 4 ++-- plug-ins/waves/Makefile.am | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/configure.in b/configure.in index 2648b69183..8bfc1e9615 100644 --- a/configure.in +++ b/configure.in @@ -85,7 +85,7 @@ gtk_found=no) ]) if test -n "$DEBUGFLAG"; then - CFLAGS="$DEBUGFLAG" + CFLAGS="$DEBUGFLAG $CFLAGS" fi dnl Checks for programs. diff --git a/docs/Makefile.am b/docs/Makefile.am index 2eb72314d8..a4ca3da349 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -6,15 +6,14 @@ EXTRA_DIST = \ cheat_sheet.txt keybindings.txt \ texinfo.tex script-fu.tex \ architecture.eps logo.eps \ - net-fu.eps timeline.eps \ - gimp-white-paper.tex + net-fu.eps timeline.eps info_TEXINFOS = pdb.texi pdb.texi: $(top_srcdir)/docs/pdb_self_doc.el pdb_dump @EMACS@ --batch -l $(top_srcdir)/docs/pdb_self_doc.el -f make-docs-noargs -pdb_dump: $(top_builddir)/app/*.c +pdb_dump: $(top_srcdir)/app/*.c $(top_builddir)/app/gimp --no-interface --batch '(gimp-procedural-db-dump "pdb_dump")' '(gimp-quit 0)' script-fu.ps: script-fu.dvi diff --git a/plug-ins/deinterlace/Makefile.am b/plug-ins/deinterlace/Makefile.am index cfe7046a57..340f9e15fc 100644 --- a/plug-ins/deinterlace/Makefile.am +++ b/plug-ins/deinterlace/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la deinterlace_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/emboss/Makefile.am b/plug-ins/emboss/Makefile.am index 2307365792..f428133878 100644 --- a/plug-ins/emboss/Makefile.am +++ b/plug-ins/emboss/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la emboss_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/hot/Makefile.am b/plug-ins/hot/Makefile.am index fe9bea2346..6849be65eb 100644 --- a/plug-ins/hot/Makefile.am +++ b/plug-ins/hot/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_buildddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la hot_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/nlfilt/Makefile.am b/plug-ins/nlfilt/Makefile.am index ca607c1754..cd053303be 100644 --- a/plug-ins/nlfilt/Makefile.am +++ b/plug-ins/nlfilt/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la nlfilt_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/sinus/Makefile.am b/plug-ins/sinus/Makefile.am index fc4eda49e4..2012b28082 100644 --- a/plug-ins/sinus/Makefile.am +++ b/plug-ins/sinus/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la sinus_DEPENDENCIES = $(DEPS) diff --git a/plug-ins/waves/Makefile.am b/plug-ins/waves/Makefile.am index 564a36ba3b..e775f426eb 100644 --- a/plug-ins/waves/Makefile.am +++ b/plug-ins/waves/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ -I$(includedir) LDADD = \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimpui.la \ $(top_builddir)/libgimp/libgimp.la \ $(X_LIBS) \ @@ -21,7 +21,7 @@ LDADD = \ DEPS = \ $(top_builddir)/libgimp/libgimpui.la \ - $(top_srcdir)/plug-ins/megawidget/libmegawidget.a \ + $(top_builddir)/plug-ins/megawidget/libmegawidget.a \ $(top_builddir)/libgimp/libgimp.la waves_DEPENDENCIES = $(DEPS)