Changeset 59d417 in git

Timestamp:

May 20, 2005, 5:54:00 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b794bd3d5fe9d0b095048b0eae5d6a49704c0e75

Parents:

43ebb1b61c83b3a963a5f598376d4eff89abe746

Message:

*hannes: mmalloc.* ->kernel


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

Location:

Singular

Files:

• Makefile.in (modified) (6 diffs)
• mmalloc.cc (deleted)
• mmalloc.h (deleted)

Singular/Makefile.in

@@ -139 +139 @@
 # special C++ source files (need extra compiling and/or linking), for which
 # dependencies should be generated
-ESOURCES=mmalloc.cc iparith.cc $(COMMON_SOURCES) \
+ESOURCES=iparith.cc $(COMMON_SOURCES) \
         $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) 
 
@@ -271 +271 @@
         echo "#undef HAVE_STATIC" > static.h
 
-Singular${S_EXT}: mod2.h Makefile version.h scanner.cc  ${OBJS} mmalloc.o \
+Singular${S_EXT}: mod2.h Makefile version.h scanner.cc  ${OBJS} \
           iparith.o tesths.cc libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
           -o Singular${S_EXT} \
           tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
-          ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug mmalloc.o
+          ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug ../kernel/mmalloc.o
 
 %.static: version.h
@@ -288 +288 @@
         ${CXX} ${CXXFLAGS}  ${CPPFLAGS} ${DEFS} -c $<   
 
-iparith.inc mpsr_Tok.inc: claptmpl.o iparith.cc mmalloc.o\
+iparith.inc mpsr_Tok.inc: claptmpl.o iparith.cc \
                           ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
              -o gentable claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
-             ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug mmalloc.o
+             ${OBJS} ${LDFLAGS} ${LIBS} -lomalloc_ndebug ../kernel/mmalloc.o
         ./gentable
         /bin/rm -f gentable gentable.exe
@@ -318 +318 @@
 # under cygwin
 ESingular: fegetopt.o mod2.h feOpt.cc version.h emacs.cc \
-           feOptES.inc mmalloc.o
+           feOptES.inc
         ${CXX} -O2 ${CPPFLAGS} ${DEFS} -DESINGULAR -o ESingular emacs.cc fegetopt.o \
-        ${LDFLAGS} -lomalloc_ndebug mmalloc.o
+        ${LDFLAGS} -lomalloc_ndebug ../kernel/mmalloc.o
 
 TSingular: fegetopt.o mod2.h feOpt.cc version.h emacs.cc \
-           feOptTS.inc mmalloc.o
+           feOptTS.inc
         ${CXX} -O2 ${CPPFLAGS} ${DEFS} -DTSINGULAR -o TSingular emacs.cc fegetopt.o \
-        ${LDFLAGS} -lomalloc_ndebug mmalloc.o
+        ${LDFLAGS} -lomalloc_ndebug ../kernel/mmalloc.o
 
 feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
@@ -608 +608 @@
         $(CCG)  ${CFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
 
-Singularg${S_EXT}: scanner.cc  $(OBJG)  mmalloc.og $(DL_LIBSG)\
+Singularg${S_EXT}: scanner.cc  $(OBJG)  $(DL_LIBSG)\
            iparith.og mpsr_Tok.og claptmpl.og tesths.cc version.h 
         $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg${S_EXT} \
-        tesths.cc iparith.og mpsr_Tok.og claptmpl.og $(OBJG) ${LDFLAGSG} ${LIBS} -lomalloc mmalloc.og \
+        tesths.cc iparith.og mpsr_Tok.og claptmpl.og $(OBJG) ${LDFLAGSG} ${LIBS} -lomalloc ../kernel/mmalloc.og \
         ${LD_DYN_FLAGS} ${LD_LIBC}
 
@@ -625 +625 @@
 
 ESingularg: fegetopt.og mod2.h feOpt.cc version.h emacs.cc \
-           feOptES.inc mmalloc.og
-        ${CXXG} ${CXXFLAGSG} ${CPPFLAGS} -DESINGULAR -g ${DEFSG} -o ESingularg emacs.cc fegetopt.og ${LDFLAGS} ${LIBS} -lomalloc mmalloc.og
+           feOptES.inc
+        ${CXXG} ${CXXFLAGSG} ${CPPFLAGS} -DESINGULAR -g ${DEFSG} -o ESingularg emacs.cc fegetopt.og ${LDFLAGS} ${LIBS} -lomalloc ../kernel/mmalloc.og
 
 ##