CVS: sml-dist/src/runtime/objs makefile,1.5,1.6 mk.x86-freebsd,1.5,1.6 mk.x86-linux,1.12,1.13

Update of /cvsroot/smlnj/sml-dist/src/runtime/objs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13218/src/runtime/objs

Modified Files:
	makefile mk.x86-freebsd mk.x86-linux 
Log Message:
heap2exec patches from Johannes 5 Joemann

Index: makefile
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/objs/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** makefile	21 Feb 2006 21:33:24 -0000	1.5
--- makefile	20 Apr 2006 15:28:53 -0000	1.6
***************
*** 115,118 ****
--- 115,134 ----
  	$(CC) -o $(RUNTIME) $(CFLAGS) $(LDFLAGS) main.o $(OBJS) $(ALL_LIBS) $(LD_LIBS) -lm
  
+ $(RUNTIME_A):	$(VERSION) main.o $(OBJS) $(ALL_LIBS)
+ 	rm -f $(RUNTIME_A)
+ 	$(AR) rc $(RUNTIME_A) main.o $(OBJS)
+ 	rm -rf tmp
+ 	mkdir tmp
+ 	for lib in $(ALL_LIBS) ; \
+ 	do \
+ 		cd tmp && \
+ 		$(AR) x ../$$lib && \
+ 		$(AR) q ../$(RUNTIME_A) *.o && \
+ 		rm * && \
+ 		cd .. ; \
+ 	done
+ 	$(RANLIB) $(RUNTIME_A)
+ 	rmdir tmp
+ 
  $(VERSION):
  		($(MAKE) MAKE="$(MAKE)" clean)

Index: mk.x86-freebsd
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/objs/mk.x86-freebsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mk.x86-freebsd	18 Nov 2004 21:38:13 -0000	1.5
--- mk.x86-freebsd	20 Apr 2006 15:28:53 -0000	1.6
***************
*** 17,26 ****
  XLIBS =		../c-libs/dl/libunix-dynload.a
  LD_LIBS =
! BASE_DEFS =	
! DEFS		= $(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_FREEBSD -DDLOPEN
  TARGET =	X86
  VERSION =	v-x86-freebsd
  RUNTIME =	run.x86-freebsd
  
  all:
  	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
--- 17,30 ----
  XLIBS =		../c-libs/dl/libunix-dynload.a
  LD_LIBS =
! BASE_DEFS =
! DEFS =		$(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_FREEBSD -DDLOPEN
  TARGET =	X86
  VERSION =	v-x86-freebsd
  RUNTIME =	run.x86-freebsd
+ RUNTIME_SO =	run.x86-freebsd.so
+ RUNTIME_A =	run.x86-freebsd.a
  
  all:
  	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+ 	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
+ 	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Index: mk.x86-linux
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/objs/mk.x86-linux,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mk.x86-linux	21 Feb 2006 21:33:24 -0000	1.12
--- mk.x86-linux	20 Apr 2006 15:28:53 -0000	1.13
***************
*** 21,25 ****
--- 21,29 ----
  VERSION =	v-x86-linux
  RUNTIME =	run.x86-linux
+ RUNTIME_SO =	run.x86-linux.so
+ RUNTIME_A =	run.x86-linux.a
  
  all:
  	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+ 	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
+ 	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642