INCLUDES fixed to allow VPATH builds

7 files changed, 28 insertions, 13 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b06824a..25a86b5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,7 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.7 2001/09/28 23:11:44 jao Exp $
+# $Id: Makefile.am,v 1.8 2001/09/29 01:53:51 jao Exp $
 
 SUBDIRS = img
 SUFFIXES = .html
@@ -19,7 +19,7 @@ info_TEXINFOS = mdk.texi
 mdk_TEXINFOS = mdk_intro.texi mdk_ack.texi mdk_tut.texi mdk_gstart.texi \
                mdk_mixvm.texi mdk_emixvm.texi mdk_mixasm.texi mdk_bugs.texi \
                mdk_index.texi mdk_gmixvm.texi mdk_install.texi \
-               mdk_mixguile.texi mdk_copying.texi
+               mdk_mixguile.texi mdk_copying.texi mdk_findex.texi
 
 html_docs = mdk.html
 
diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am
index 36af4b2..3e0f46e 100644
--- a/mixgtk/Makefile.am
+++ b/mixgtk/Makefile.am
@@ -10,6 +10,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# $Id: Makefile.am,v 1.14 2001/09/29 01:53:51 jao Exp $
+
 XPMS = clear.xpm colors.xpm compile.xpm edit.xpm font.xpm fontl.xpm \
        jump.xpm next.xpm onew.xpm open.xpm output.xpm run.xpm splitw.xpm \
        symbols.xpm extern.xpm devdir.xpm
@@ -26,7 +28,8 @@ if MAKE_GUI
 
 pkgdata_DATA = mixgtk.glade $(XPMS)
 
-INCLUDES = -I$(includedir) -DGLADE_FILE=\""$(pkgdatadir)/mixgtk.glade"\"\
+INCLUDES = -I$(includedir) -I$(top_srcdir) \
+           -DGLADE_FILE=\""$(pkgdatadir)/mixgtk.glade"\"\
            -DLOCAL_GLADE_FILE=\"mixgtk.glade\" $(GUILED)
 LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a\
         $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
diff --git a/mixguile/Makefile.am b/mixguile/Makefile.am
index fed3371..41182b9 100644
--- a/mixguile/Makefile.am
+++ b/mixguile/Makefile.am
@@ -10,6 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# $Id: Makefile.am,v 1.5 2001/09/29 01:53:51 jao Exp $
 
 SCM_FILES = mixguile.scm mixguile-commands.scm
 EXTRA_DIST = $(SCM_FILES)
@@ -22,8 +23,9 @@ SCM_PATHS = -DSCM_FILE=\""$(pkgdatadir)/mixguile.scm"\"\
             -DLOCAL_SCM_FILE=\"mixguile.scm\"
 
 pkgdata_DATA = $(SCM_FILES)
-INCLUDES = -I$(includedir) $(SCM_PATHS)
-libmixguile_a_INCLUDES = -I$(includedir) -DG_LOG_DOMAIN=\"libmixguile\"
+INCLUDES = -I$(includedir) -I$(top_srcdir) $(SCM_PATHS)
+libmixguile_a_INCLUDES = -I$(includedir) -I$(top_srcdir) \
+                         -DG_LOG_DOMAIN=\"libmixguile\"
 libmixguile_a_SOURCES = mixguile.h mixguile.c \
                         mixguile_cmd_dispatcher.h mixguile_cmd_dispatcher.c \
                         xmixguile_cmd_dispatcher.h xmixguile_cmd_dispatcher.c
diff --git a/mixlib/Makefile.am b/mixlib/Makefile.am
index 3b51a0e..3b5a292 100644
--- a/mixlib/Makefile.am
+++ b/mixlib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 #  
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without 
@@ -10,8 +10,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# $Id: Makefile.am,v 1.5 2001/09/29 01:53:51 jao Exp $
+
 SUBDIRS = testsuite
-INCLUDES = -I$(includedir) -DG_LOG_DOMAIN=\"libmix\" 
+INCLUDES = -I$(includedir) -I$(top_srcdir) -DG_LOG_DOMAIN=\"libmix\" 
 
 noinst_LIBRARIES = libmix.a
 libmix_a_SOURCES = mix.h mix.c \
diff --git a/mixlib/testsuite/Makefile.am b/mixlib/testsuite/Makefile.am
index 6e771c4..834f833 100644
--- a/mixlib/testsuite/Makefile.am
+++ b/mixlib/testsuite/Makefile.am
@@ -1,4 +1,6 @@
-# Copyright (C) 1999 Free Software Foundation, Inc.
+## Process this file with automake to produce Makefile.in
+
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 #  
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without 
@@ -8,7 +10,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-INCLUDES = -I.. 
+# $Id: Makefile.am,v 1.2 2001/09/29 01:53:51 jao Exp $
+
+INCLUDES =  -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/mixlib
 LDADD = $(top_builddir)/mixlib/libmix.a 
 
 check_PROGRAMS = mixtypest mixinstest mixvminstest mixparsertest mixdevtest mixevaltest
diff --git a/mixutils/Makefile.am b/mixutils/Makefile.am
index 314c3ed..e331b7e 100644
--- a/mixutils/Makefile.am
+++ b/mixutils/Makefile.am
@@ -10,10 +10,12 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+# $Id: Makefile.am,v 1.8 2001/09/29 01:53:51 jao Exp $
+
 if MAKE_GUILE
-INCLUDES =  -I$(includedir) -DMAKE_GUILE
+INCLUDES =  -I$(includedir) -I$(top_srcdir) -DMAKE_GUILE
 else
-INCLUDES = -I$(includedir)
+INCLUDES = -I$(includedir) -I$(top_srcdir)
 endif
 
 LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a \
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 0d452a1..f3a7947 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000 Jose Antonio Ortega Ruiz <jaortega@retemail.es>
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 #  
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without 
@@ -10,5 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-EXTRA_DIST =*.mixal primes.result
+# $Id: Makefile.am,v 1.2 2001/09/29 01:53:51 jao Exp $
 
+EXTRA_DIST = primes.result hello.mixal primes.mixal stress0.mixal\
+ stress1.mixal stress2.mixal stress4.mixal stress5.mixal stress6.mixal