[Dotgnu-pnet-commits] pnetlib/JScript JScript.build, 1.12, 1.13 Makefile.am, 1.4, 1.5

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/JScript
In directory subversions:/tmp/cvs-serv5469/JScript

Modified Files:
        JScript.build Makefile.am 
Log Message:


Fix out of tree builds.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am 26 Nov 2003 21:38:34 -0000      1.4
--- Makefile.am 27 Nov 2003 01:00:57 -0000      1.5
***************
*** 5,9 ****
  
  Microsoft.JScript.dll: Nodes/JNode.cs
!       "$(CSANT)" $(CSANT_FLAGS) -f JScript.build all
  
  TREECC_INPUTS = $(srcdir)/Nodes/JNode.tc \
--- 5,10 ----
  
  Microsoft.JScript.dll: Nodes/JNode.cs
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -f "$(srcdir)/JScript.build" all
  
  TREECC_INPUTS = $(srcdir)/Nodes/JNode.tc \
***************
*** 12,15 ****
--- 13,17 ----
  
  Nodes/JNode.cs: $(TREECC_INPUTS)
+       test -d Nodes || mkdir Nodes
        $(TREECC) -f -o Nodes/JNode.cs $(srcdir)/Nodes/JNode.tc
  
***************
*** 19,24 ****
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
!       "$(CSANT)" $(CSANT_FLAGS) -f JScript.build \
!                       -a $(DESTDIR)$(libdir)/cscc/lib -i all
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        rm -f $(DESTDIR)$(bindir)/jsrun.exe
--- 21,26 ----
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -f "$(srcdir)/JScript.build" -i all
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        rm -f $(DESTDIR)$(bindir)/jsrun.exe
***************
*** 29,34 ****
  uninstall-local:
        @$(NORMALL_UNINSTALL)
!       "$(CSANT)" $(CSANT_FLAGS) -f JScript.build \
!                       -a $(DESTDIR)$(libdir)/cscc/lib -u all
        rm -f $(DESTDIR)$(bindir)/jsrun.exe
        rm -f $(DESTDIR)$(bindir)/jsrun
--- 31,36 ----
  uninstall-local:
        @$(NORMALL_UNINSTALL)
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -f "$(srcdir)/JScript.build" -u all
        rm -f $(DESTDIR)$(bindir)/jsrun.exe
        rm -f $(DESTDIR)$(bindir)/jsrun

Index: JScript.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/JScript.build,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JScript.build       26 Nov 2003 21:38:34 -0000      1.12
--- JScript.build       27 Nov 2003 01:00:57 -0000      1.13
***************
*** 21,24 ****
--- 21,28 ----
                                <includes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Parser/*.cs"/>
                                <includes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Vsa/*.cs"/>
+                               <excludes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Nodes/JNode.cs"/>
+                               <file if="${CONFIG_EXTENDED_NUMERICS}"
+                                     basedir="${csant.build.dir}"
+                                     name="Nodes/JNode.cs"/>
                                <file name="jsstub.cs"/>
                        </sources>
***************
*** 61,64 ****
--- 65,72 ----
                                <includes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Parser/*.cs"/>
                                <includes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Vsa/*.cs"/>
+                               <excludes if="${CONFIG_EXTENDED_NUMERICS}" 
name="Nodes/JNode.cs"/>
+                               <file if="${CONFIG_EXTENDED_NUMERICS}"
+                                     basedir="${csant.build.dir}"
+                                     name="Nodes/JNode.cs"/>
                                <file name="jsstub.cs"/>
                        </sources>