Changeset 5f27266 in git

Timestamp:

Oct 5, 2005, 11:41:18 AM (19 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

e24823f3896d3cb299f2d05094a88abf6a9a4df1

Parents:

da6d304dee93a85fe3e57e847a1f34aacf8c35c8

Message:

Makefile.in:

Anpassungen für vollst. Compilieren unter Cygwin, protected from different Systems


git-svn-id: file:///usr/local/Singular/svn/trunk@8687 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/Makefile.in (modified) (7 diffs)

Singular/Makefile.in

@@ -72 +72 @@
 SFLAGS          = @SFLAGS@
 SLDFLAGS        = @SLDFLAGS@
+
+## For PYSingular
+ifneq ($(SINGUNAME),ix86-Win)
+WIN_LIBS        =
+else
+WIN_LIBS        = ../modules/python_module.bin
+endif
 
 LD_LIBC         = -lc
@@ -133 +140 @@
 
 # normal C source files
-CSOURCES= 
+CSOURCES=
 
 # C++ sources which are used if part of the kernel are dynamically linked
@@ -143 +150 @@
 
 # C++ sources which are used if no parts of the kernel are dynamically linked
-STATIC_SOURCES=slInit_Static.cc 
+STATIC_SOURCES=slInit_Static.cc
 
 # C++ sources for which both, shared and static object files are needed
@@ -283 +290 @@
 
 Singular${S_EXT}: mod2.h Makefile version.h scanner.cc  ${OBJS} \
-          iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
+          iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) $(WIN_LIBS)
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
           -o Singular${S_EXT} \
@@ -289 +296 @@
           ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug ../kernel/mmalloc.o
 
+../modules/python_module.bin:
+        cd ../modules/python; scons
+
 %.static: version.h
         ${MAKE} DL_KERNEL=0 S_EXT=".static" $@
@@ -297 +307 @@
 
 claptmpl.o: claptmpl.cc mod2.h
-        ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<   
+        ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<
 
 iparith.inc mpsr_Tok.inc: claptmpl.o iparith.cc \
@@ -364 +374 @@
         $(LD) ${SLDFLAGS} -o $@ $^
 
-src: scanner.cc grammar.h grammar.cc libparse.cc 
+src: scanner.cc grammar.h grammar.cc libparse.cc
 
 mod2.h: stamp-h