From d0392a026b06b7dcca5d3d7cc795f4f39b4ebcb6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Tue, 25 Jan 2011 17:33:36 +0000
Subject: [PATCH] small fixes to make some `Makefiles' ready for build in a
 separate directory

---
 ChangeLog                                              | 6 ++++++
 src/frontend/Makefile.am                               | 5 +++--
 src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml | 9 ++++++---
 src/spicelib/parser/Makefile.am                        | 4 ++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9293549a..3c9d5ffc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-25  Robert Larice
+ * src/frontend/Makefile.am ,
+ * src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+ * src/spicelib/parser/Makefile.am
+   small fixes to make some `Makefiles' ready for build in a separate directory
+
 11-01-18 Holger Vogt
  * plotcurv.c: line 139 test for existance of v_plot before comparing 
   pl_scale
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
index 1eced1c55..1bcbe86bd 100644
--- a/src/frontend/Makefile.am
+++ b/src/frontend/Makefile.am
@@ -197,5 +197,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include @X_CFLAGS@
 MAINTAINERCLEANFILES = Makefile.in
 
 parse-bison.c parse-bison.h : parse-bison.y
-	bison $<
-parse.c : parse-bison.c
+	bison $(srcdir)/parse-bison.y
+
+$(srcdir)/parse.c : parse-bison.c
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 26b1c5eb0..a914a463d 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.15  2011-01-13 17:05:46  dwarning
+  Revision 1.16  2011-01-25 17:33:37  rlar
+  small fixes to make some `Makefiles' ready for build in a separate directory
+
+  Revision 1.15  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.14  2008/12/22 08:16:59  dwarning
@@ -88,9 +91,9 @@
 <admst:variable name="module" select="%s"/>
 ## Process this file with automake to produce Makefile.in
 
-ADMSXMLINTERFACE=../admst
+ADMSXMLINTERFACE=\$(srcdir)/../admst
 $(module).c: admsva/$(module).va
-	admsXml -Iadmsva admsva/$(module).va \\
+	admsXml -I\$(srcdir) -I\$(srcdir)/admsva \$(srcdir)/admsva/$(module).va \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\
diff --git a/src/spicelib/parser/Makefile.am b/src/spicelib/parser/Makefile.am
index 6bb19acd5..d8d20905d 100644
--- a/src/spicelib/parser/Makefile.am
+++ b/src/spicelib/parser/Makefile.am
@@ -69,9 +69,9 @@ libinp_la_SOURCES = \
 		sperror.c	\
 		inp.h
 
-inpptree.c : inpptree-parser.c
+$(srcdir)/inpptree.c : inpptree-parser.c
 inpptree-parser.c inpptree-parser.h : inpptree-parser.y
-	bison $<
+	bison $(srcdir)/inpptree-parser.y
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/frontend