[Xsb-commits] CVS: XSB/build configure,1.110,1.111 configure.in,1.117,1.118 emuMakefile.in,1.37,1.38

[David S. W. <dw...@us...>]

Update of /cvsroot/xsb/XSB/build
In directory usw-pr-cvs1:/tmp/cvs-serv15777

Modified Files:
	configure configure.in emuMakefile.in 
Log Message:
Tanya fixed makefiles to not be gnu-make dependent.


Index: configure
===================================================================
RCS file: /cvsroot/xsb/XSB/build/configure,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- configure	2001/10/09 05:48:21	1.110
+++ configure	2001/11/19 22:39:35	1.111
@@ -3348,8 +3348,12 @@
    esac
 fi
 
+# this is needed for -mno-cygwin dll compilation
+DLLTYPE=nodll
+
 if test "${enable_no_cygwin+set}" = "set"; then
    CC="${CC} -mno-cygwin"
+   DLLTYPE=cygdll
 fi
 
 builtinsCFLAGS="${c_site_includes} ${builtins_opt_level} ${c_inline_level} ${CFLAGS}"
@@ -3441,6 +3445,7 @@
 
 
 
+
 topdir_base=/`basename $topdir`
 topdir_wind=`echo $topdir_base | sed 's,/,\\\\,g'`
 
@@ -3656,6 +3661,7 @@
 s%@ODBCOBJ@%$ODBCOBJ%g
 s%@mno_cyg_inclib@%$mno_cyg_inclib%g
 s%@mno_cyg_lib@%$mno_cyg_lib%g
+s%@DLLTYPE@%$DLLTYPE%g
 s%@topdir_wind@%$topdir_wind%g
 s%@smodels_goal@%$smodels_goal%g
 s%@with_smodels@%$with_smodels%g

Index: configure.in
===================================================================
RCS file: /cvsroot/xsb/XSB/build/configure.in,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- configure.in	2001/10/09 05:48:21	1.117
+++ configure.in	2001/11/19 22:39:35	1.118
@@ -1225,8 +1225,12 @@
    esac
 fi
 
+# this is needed for -mno-cygwin dll compilation
+DLLTYPE=nodll
+
 if test "${enable_no_cygwin+set}" = "set"; then
    CC="${CC} -mno-cygwin"
+   DLLTYPE=cygdll
 fi
 
 builtinsCFLAGS="${c_site_includes} ${builtins_opt_level} ${c_inline_level} ${CFLAGS}"
@@ -1314,6 +1318,7 @@
 AC_SUBST(ODBCOBJ)
 AC_SUBST(mno_cyg_inclib)
 AC_SUBST(mno_cyg_lib)
+AC_SUBST(DLLTYPE)
 
 topdir_base=/`basename $topdir`
 topdir_wind=`echo $topdir_base | sed 's,/,\\\\,g'`

Index: emuMakefile.in
===================================================================
RCS file: /cvsroot/xsb/XSB/build/emuMakefile.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- emuMakefile.in	2001/10/09 18:23:53	1.37
+++ emuMakefile.in	2001/11/19 22:39:35	1.38
@@ -41,18 +41,16 @@
 LDFLAGS=@LDFLAGS@
 ODBCSRC=@ODBCSRC@
 ODBCOBJ=@ODBCOBJ@
+DLLTYPE=@DLLTYPE@
 
-
 # For mno-cygwin 
 # -mdll option is needed so that MSVC files could link to dll
 # however for old cygwin versions -dll option is used  
 mno_cyg_inclib=@mno_cyg_inclib@
 mno_cyg_lib=@mno_cyg_lib@
-ifneq ($(strip $(mno_cyg_inclib)),)
 #cygconf=`(uname -m) 2>/dev/null` || cygconf=unknown
 cygconf=i686
 cygdirname=${cygconf}-cygwin
-endif
 DLLTOOL=dlltool
 DLLNAME=xsb.dll
 DLL_LIBS=$(LDFLAGS) -L /usr/$(cygdirname)/lib -lmingw32 -lmoldname -lcrtdll -lkernel32 -L /usr/lib/gcc-lib/$(cygdirname)/2.9-cygwin-990830 -lgcc
@@ -184,9 +182,12 @@
 # BASEFILE temporary
 # EXPFILE  temporary
 # ENTRY is the entry point  int WINAPI startup (HINSTANCE, DWORD, LPVOID)
+
+dll: $(DLLTYPE)
 
-dll: $(HEADERS) $(DEF_FILE) xsb.o
-ifneq ($(strip $(mno_cyg_inclib)),)
+nodll:
+
+cygdll: $(HEADERS) $(DEF_FILE) xsb.o
 	$(CC) -I$(arch_config_prefix) $(mno_cyg_inclib) -c $(CFLAGS) dllinit_xsb.cc
 	@cp dllinit_xsb.o $(arch_config_objlibdir) 2> /dev/null || echo ""
 	$(LD) -s --base-file $(BASE_FILE) --dll -o $(DLLNAME) $(LIB_OBJECTS) $(DLL_LIBS) -e $(ENTRY_FUNCTION)
@@ -199,8 +200,6 @@
 	@mv $(LIB_FILE) $(bindir) 2> /dev/null || echo ""
 	@rm -f $(BASE_FILE) 2> /dev/null || echo ""
 	@rm -f $(EXP_FILE) 2> /dev/null || echo ""
-endif
-
 
 
 #=======================================================================