From cca4047f8f7eafb9fd1de97bd4983d9ef3f5cb54 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 12 Aug 2011 19:30:56 +0000
Subject: [PATCH] adms, fix parallel execution when using make -j

---
 ChangeLog                                     |   5 +
 src/spicelib/devices/adms/admst/ngspice.xml   |  62 ++------
 .../devices/adms/admst/ngspiceMakefile.am.xml | 147 +++++++-----------
 3 files changed, 73 insertions(+), 141 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92e24d55b..277155797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12  Robert Larice
+ * src/spicelib/devices/adms/admst/ngspice.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml :
+   adms, fix parallel execution when using make -j
+
 2011-08-12  Robert Larice
  * src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml ,
  * src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml ,
diff --git a/src/spicelib/devices/adms/admst/ngspice.xml b/src/spicelib/devices/adms/admst/ngspice.xml
index 426172da8..d0c7fc314 100644
--- a/src/spicelib/devices/adms/admst/ngspice.xml
+++ b/src/spicelib/devices/adms/admst/ngspice.xml
@@ -3618,13 +3618,10 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
 ## Process this file with automake to produce Makefile.in
 
 ADMSXMLINTERFACE=\$(srcdir)/../admst
-$(module).c: \$(ADMSXMLINTERFACE)/ngspice.xml
-$(module).c: admsva/$(module).va
-	admsXml -I\$(srcdir) -I\$(srcdir)/admsva -f \$(srcdir)/admsva/$(module).va -e \$(ADMSXMLINTERFACE)/ngspice.xml
 
 noinst_LTLIBRARIES = lib$(module).la
 
-lib$(module)_la_SOURCES = 	\\
+BUILT_SOURCES = \\
 	$(module).c		\\
 	$(module).hxx		\\
 	$(module)acld.c	\\
@@ -3647,53 +3644,11 @@ lib$(module)_la_SOURCES = 	\\
 	$(module)temp.c	\\
 	$(module)trunc.c
 
-BUILT_SOURCES = 	\\
-	$(module).c		\\
-	$(module).hxx		\\
-	$(module)acld.c	\\
-	$(module)ask.c	\\
-	$(module)defs.h	\\
-	$(module)del.c	\\
-	$(module)dest.c	\\
-	$(module)ext.h	\\
-	$(module)guesstopology.c	\\
-	$(module)init.c	\\
-	$(module)init.h	\\
-	$(module)itf.h	\\
-	$(module)load.c	\\
-	$(module)mask.c	\\
-	$(module)mdel.c	\\
-	$(module)mpar.c	\\
-	$(module)par.c	\\
-	$(module)pzld.c	\\
-	$(module)setup.c	\\
-	$(module)temp.c \\
-	$(module)trunc.c
+lib$(module)_la_SOURCES = \\
+	\$(BUILT_SOURCES)
 
-CLEANFILES = 		\\
-	$(module).c		\\
-	$(module).hxx		\\
-	$(module).c.bak	\\
-	$(module)acld.c	\\
-	$(module)ask.c	\\
-	$(module)defs.h	\\
-	$(module)del.c	\\
-	$(module)dest.c	\\
-	$(module)ext.h	\\
-	$(module)guesstopology.c	\\
-	$(module)init.c	\\
-	$(module)init.h	\\
-	$(module)itf.h	\\
-	$(module)load.c	\\
-	$(module)mask.c	\\
-	$(module)mdel.c	\\
-	$(module)mpar.c	\\
-	$(module)par.c	\\
-	$(module)pzld.c	\\
-	$(module)setup.c	\\
-	$(module)temp.c	\\
-	$(module)noise.c	\\
-	$(module)trunc.c \\
+CLEANFILES = \\
+	\$(BUILT_SOURCES) \\
 	.$(module).va.adms \\
 	.adms.implicit.xml \\
 	.interface.xml \\
@@ -3708,6 +3663,13 @@ AM_CPPFLAGS = -I\$(top_srcdir)/src/include
 
 MAINTAINERCLEANFILES = Makefile.in
 
+%.c %.hxx \\
+	%acld.c %ask.c %defs.h %del.c %dest.c %ext.h %guesstopology.c \\
+	%init.c %init.h %itf.h %load.c %mask.c %mdel.c %mpar.c %par.c \\
+        %pzld.c %setup.c %temp.c %trunc.c \\
+: \$(srcdir)/admsva/%.va \$(ADMSXMLINTERFACE)/ngspice.xml
+	admsXml -I\$(srcdir) -I\$(srcdir)/admsva -f \$&lt; -e \$(ADMSXMLINTERFACE)/ngspice.xml
+
 </admst:template>
     <admst:if test="[exists(/argv[.='--create_makefile_am'])]">
       <admst:message format="flag &quot;--create_makefile_am&quot; found at the command line\n"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index d4ad3db53..ae005adfe 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.22  2011-08-12 15:18:41  rlar
+  Revision 1.23  2011-08-12 19:30:56  rlar
+  adms, fix parallel execution when using make -j
+
+  Revision 1.22  2011/08/12 15:18:41  rlar
   pull two -adms3 fixes into -adms
 
   Revision 1.21  2011/07/23 07:57:07  dwarning
@@ -104,7 +107,57 @@
 ## Process this file with automake to produce Makefile.in
 
 ADMSXMLINTERFACE=\$(srcdir)/../admst
-$(module).c: \\
+
+noinst_LTLIBRARIES = lib$(module).la
+
+BUILT_SOURCES = \\
+	$(module).c	\\
+	$(module).hxx	\\
+	$(module)acld.c	\\
+	$(module)ask.c	\\
+	$(module)defs.h	\\
+	$(module)del.c	\\
+	$(module)dest.c	\\
+	$(module)ext.h	\\
+	$(module)guesstopology.c	\\
+	$(module)init.c	\\
+	$(module)init.h	\\
+	$(module)itf.h	\\
+	$(module)load.c	\\
+	$(module)mask.c	\\
+	$(module)mdel.c	\\
+	$(module)mpar.c	\\
+	$(module)par.c	\\
+	$(module)pzld.c	\\
+	$(module)setup.c	\\
+	$(module)temp.c	\\
+	$(module)trunc.c
+
+lib$(module)_la_SOURCES = 	\\
+	\$(BUILT_SOURCES)
+
+CLEANFILES = \\
+	\$(BUILT_SOURCES)	\\
+	$(module)noise.c	\\
+	.$(module).va.adms \\
+	.adms.implicit.xml \\
+	.interface.xml \\
+	*.h \\
+	*.xml
+
+#TODO (not implemented) \\
+	$(module)conv.c	\\
+	$(module)getic.c
+
+AM_CPPFLAGS = -I\$(top_srcdir)/src/include
+
+MAINTAINERCLEANFILES = Makefile.in
+
+\%.c \%.hxx \\
+	\%acld.c \%ask.c \%defs.h \%del.c \%dest.c \%ext.h \%guesstopology.c \\
+	\%init.c \%init.h \%itf.h \%load.c \%mask.c \%mdel.c \%mpar.c \%par.c \\
+	\%pzld.c \%setup.c \%temp.c \%trunc.c \\
+ : \$(srcdir)/admsva/\\%.va \\
 	\$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
 	\$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
 	\$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\
@@ -128,9 +181,7 @@ $(module).c: \\
 	\$(ADMSXMLINTERFACE)/ngspiceMODULEguesstopology.c.xml \\
 	\$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\
 	\$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml
-
-$(module).c: admsva/$(module).va
-	admsXml -I\$(srcdir) -I\$(srcdir)/admsva \$(srcdir)/admsva/$(module).va \\
+	admsXml -I\$(srcdir) -I\$(srcdir)/admsva \$&lt; \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\
@@ -155,92 +206,6 @@ $(module).c: admsva/$(module).va
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml
 
-noinst_LTLIBRARIES = lib$(module).la
-
-lib$(module)_la_SOURCES = 	\\
-	$(module).c		\\
-	$(module).hxx		\\
-	$(module)acld.c	\\
-	$(module)ask.c	\\
-	$(module)defs.h	\\
-	$(module)del.c	\\
-	$(module)dest.c	\\
-	$(module)ext.h	\\
-	$(module)guesstopology.c	\\
-	$(module)init.c	\\
-	$(module)init.h	\\
-	$(module)itf.h	\\
-	$(module)load.c	\\
-	$(module)mask.c	\\
-	$(module)mdel.c	\\
-	$(module)mpar.c	\\
-	$(module)par.c	\\
-	$(module)pzld.c	\\
-	$(module)setup.c	\\
-	$(module)temp.c	\\
-	$(module)trunc.c
-
-BUILT_SOURCES = 	\\
-	$(module).c		\\
-	$(module).hxx		\\
-	$(module)acld.c	\\
-	$(module)ask.c	\\
-	$(module)defs.h	\\
-	$(module)del.c	\\
-	$(module)dest.c	\\
-	$(module)ext.h	\\
-	$(module)guesstopology.c	\\
-	$(module)init.c	\\
-	$(module)init.h	\\
-	$(module)itf.h	\\
-	$(module)load.c	\\
-	$(module)mask.c	\\
-	$(module)mdel.c	\\
-	$(module)mpar.c	\\
-	$(module)par.c	\\
-	$(module)pzld.c	\\
-	$(module)setup.c	\\
-	$(module)temp.c \\
-	$(module)trunc.c
-
-CLEANFILES = 		\\
-	$(module).c		\\
-	$(module).hxx		\\
-	$(module).c.bak	\\
-	$(module)acld.c	\\
-	$(module)ask.c	\\
-	$(module)defs.h	\\
-	$(module)del.c	\\
-	$(module)dest.c	\\
-	$(module)ext.h	\\
-	$(module)guesstopology.c	\\
-	$(module)init.c	\\
-	$(module)init.h	\\
-	$(module)itf.h	\\
-	$(module)load.c	\\
-	$(module)mask.c	\\
-	$(module)mdel.c	\\
-	$(module)mpar.c	\\
-	$(module)par.c	\\
-	$(module)pzld.c	\\
-	$(module)setup.c	\\
-	$(module)temp.c	\\
-	$(module)noise.c	\\
-	$(module)trunc.c \\
-	.$(module).va.adms \\
-	.adms.implicit.xml \\
-	.interface.xml \\
-	*.h \\
-	*.xml
-
-#TODO (not implemented) \\
-	$(module)conv.c	\\
-	$(module)getic.c
-
-AM_CPPFLAGS = -I\$(top_srcdir)/src/include
-
-MAINTAINERCLEANFILES = Makefile.in
-
 </admst:template>
 
 <admst:for-each select="/module">