[singular] 01/03: fix mmInit weirdness.

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository singular.

commit 22b369a791949339d441af8157a1ef8697785f81
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat Sep 14 18:11:32 2013 +0200

    fix mmInit weirdness.
---
 Singular/Makefile.in | 12 ++++++++----
 Singular/misc_ip.cc  |  7 -------
 Singular/mmInit.cc   |  8 ++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Singular/Makefile.in b/Singular/Makefile.in
index c1e69bd..23beba4 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -216,7 +216,7 @@ endif
 CXXSOURCES=grammar.cc scanner.cc attrib.cc \
     blackbox.cc eigenval_ip.cc\
     extra.cc fehelp.cc feOpt.cc \
-    ipassign.cc ipconv.cc ipid.cc iplib.cc \
+    ipassign.cc ipconv.cc ipid.cc \
     ipprint.cc ipshell.cc \
     newstruct.cc lists.cc \
     sdb.cc \
@@ -364,6 +364,10 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
 
 .cc.o:	
 	${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+
+iplib_lib.o: iplib.cc
+	${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} -DLIBSINGULAR ${CPPFLAGS} ${DEFS} -c $< -o $@
+
 .c.o:
 	${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
 
@@ -392,10 +396,10 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
 libsingular: libsingular.${SO_SUFFIX}
 
 libsingular.${SO_SUFFIX}: version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
-         iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
+         iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) mmInit.o iplib_lib.o
 	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
- 	tesths.o iparith.o mpsr_Tok.o claptmpl.o \
- 	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
+	iparith.o mpsr_Tok.o claptmpl.o mmInit.o iplib_lib.o \
+	    ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L../omalloc -L${libdir} ${LIBSINGULAR_LIBS}
 
 libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
          iparith.o libparse.cc claptmpl.o mpsr_Tok.o
diff --git a/Singular/misc_ip.cc b/Singular/misc_ip.cc
index bd2c2b5..a00659d 100644
--- a/Singular/misc_ip.cc
+++ b/Singular/misc_ip.cc
@@ -1220,11 +1220,4 @@ void siInit(char *name)
 }
 
 #ifdef LIBSINGULAR
-#ifdef HAVE_FACTORY
-// the init routines of factory need mmInit
-int mmInit( void )
-{
-  return 1;
-}
-#endif
 #endif
diff --git a/Singular/mmInit.cc b/Singular/mmInit.cc
new file mode 100644
index 0000000..aa49bae
--- /dev/null
+++ b/Singular/mmInit.cc
@@ -0,0 +1,8 @@
+#include <kernel/mod2.h>
+#ifdef HAVE_FACTORY
+// the init routines of factory need mmInit
+int mmInit( void )
+{
+  return 1;
+}
+#endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git