[singular] 05/19: miscellaneous Makefile.in patches
felix salfelder
felix-guest at moszumanska.debian.org
Mon May 26 13:18:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
felix-guest pushed a commit to branch master
in repository singular.
commit d214a720c0d0bbc9f76cc34086f520a3c6434d6d
Author: Felix Salfelder <felix at salfelder.org>
Date: Thu Feb 16 12:37:00 2012 +0100
miscellaneous Makefile.in patches
- fix flags (mostly search paths)
- repair default and install targets
- remove dependency on mod2.h in kernel. "make depend" works fine
Forwarded: not-needed
---
Singular/Makefile.in | 44 +++++++++++++++++++++++++-------------------
emacs/Makefile.in | 5 ++++-
factory/GNUmakefile.in | 18 ++++++++++--------
kernel/Makefile.in | 10 +++++-----
omalloc/Makefile.in | 6 +++---
5 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/Singular/Makefile.in b/Singular/Makefile.in
index 807d786..6b94ca2 100644
--- a/Singular/Makefile.in
+++ b/Singular/Makefile.in
@@ -93,7 +93,7 @@ endif
DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
LDFLAGS2 = @LDFLAGS@
ifneq ($(SINGUNAME),ix86-Win)
-LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
+LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
else
@@ -363,9 +363,9 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
fi
.cc.o:
- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
.c.o:
- ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
%.dl_o : %.cc
${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
@@ -387,11 +387,13 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
-libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
+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
$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
- iparith.o mpsr_Tok.o claptmpl.o \
- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
+ tesths.o iparith.o mpsr_Tok.o claptmpl.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
@@ -427,13 +429,16 @@ iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
-o gentable1
./gentable1
- /bin/rm -f gentable1 gentable1.exe
+ # /bin/rm -f gentable1 gentable1.exe
mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable2.cc \
-o gentable2
./gentable2
- /bin/rm -f gentable2 gentable2.exe
+ # /bin/rm -f gentable2 gentable2.exe
+ #
+ # FIXME: the above doesnt work.
+ touch $@
version.h: ${SOURCES} ${HEADERS} Makefile.in mod2.h.in \
@@ -473,17 +478,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
extra.o: feOpt.inc
-feOpt.inc: feOpt.cc mod2.h
+feOpt.inc: feOpt.cc |mod2.h
$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
./feOpt
/bin/rm -f feOpt feOpt.exe
-feOptES.inc: feOpt.cc mod2.h
+feOptES.inc: feOpt.cc |mod2.h
$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DESINGULAR -I../kernel feOpt.cc -o feOptES
./feOptES
rm -f feOptES feOptES.exe
-feOptTS.inc: feOpt.cc mod2.h
+feOptTS.inc: feOpt.cc |mod2.h
$(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
./feOptTS
rm -f feOptTS feOptTS.exe
@@ -555,11 +560,11 @@ endif
##
## install targets
##
-install: all installbin installslib
+install: all installbin installslib install-libsingular
install_all: install
-install-nolns: all installbin-nolns installslib-nolns
+install-ln: all installbin installslib-ln
installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
${MKINSTALLDIRS} $(DESTDIR)${bindir} $(DESTDIR)${bindir_mod}
@@ -568,7 +573,7 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
done
-for file in MOD/*.so; do \
- ${INSTALL_PROGRAM} $$file ${bindir}/MOD; \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}/MOD; \
done
${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
@@ -584,7 +589,7 @@ installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
${INSTALL_PROGRAM} $$file ${bindir}; \
done
-for file in MOD/*.so; do \
- ${INSTALL_PROGRAM} $$file ${bindir}/MOD; \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}/MOD; \
done
${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
${INSTALL_PROGRAM} ESingular TSingular ${DL_LIBS} $(DESTDIR)${bindir}
@@ -592,10 +597,10 @@ installbin-nolns: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
rm -f $(DESTDIR)${bindir}/${SING_EXEC}${EXEC_EXT}
${INSTALL_PROGRAM} ${SINGULAR} $(DESTDIR)${bindir}/Singular${EXEC_EXT};
-installslib: LIB
+installslib-ln: LIB
test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
-installslib-nolns: LIB
+installslib: LIB
${MKINSTALLDIRS} $(DESTDIR)${slibdir}
for file in `pwd`/LIB/*.lib; do \
${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
@@ -630,11 +635,12 @@ mostlyclean:
-rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
-rm -f *.o *.og core *.op *.so* *.dl_o*
-rm -rf MOD
- -rm -f ESingular* TSingular*
+ -rm -f ESingular* TSingular* libsingular
clean: mostlyclean
-rm -f *.bak *.d *.dd depend
-rm -f ${slibdir}
+ -rm -f gentable1 gentable2
distclean: clean
-rm -f iparith.inc mpsr_Tok.inc stamp.h
diff --git a/emacs/Makefile.in b/emacs/Makefile.in
index 86ba445..47c57e1 100644
--- a/emacs/Makefile.in
+++ b/emacs/Makefile.in
@@ -42,9 +42,12 @@ lib-cmpl.el: ${prefix}/Singular/Makefile lib.pl
(cd ${prefix}/Singular;${MAKE} --no-print-directory -s -f Makefile echoLIBS) > lib-temp
${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el
-clean mostlyclean distclean:
+clean mostlyclean:
rm -f cmd-cmpl.el hlp-cmpl.el lib-cmpl.el ex-cmpl.el
+distclean: mostlyclean
+ rm -f Makefile
+
install-sharedist: all
${MKINSTALLDIRS} ${emacsdir}
${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
index 43f11e9..cb28207 100644
--- a/factory/GNUmakefile.in
+++ b/factory/GNUmakefile.in
@@ -386,24 +386,24 @@ distfiles := \
#
# how to create library objects
-%.o: %.cc config.h factoryconf.h
+%.o: %.cc config.h |factoryconf.h
$(CXX) -c $< $(LIBCXXFLAGS) -o $@
%.o: %.c config.h
$(CC) -c $< $(LIBCFLAGS) -o $@
# the debug version:
-%.og: %.cc config.h factoryconf.h
+%.og: %.cc config.h |factoryconf.h
$(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
# the profiling version:
-%.op: %.cc config.h factoryconf.h
+%.op: %.cc config.h |factoryconf.h
$(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
# how to create dependency files. To avoid broken dependency files
# (which in turn break this GNUmakefile) we first generate them in
# a temporary file which we then move to the destination file.
-%.dtmp: %.cc factoryconf.h config.h
+%.dtmp: %.cc |factoryconf.h config.h
echo $*.d "\\" > $@
$(CXX) -MM $< $(DEPCXXFLAGS) >> $@
-%.dtmp: %.c factoryconf.h config.h
+%.dtmp: %.c |factoryconf.h config.h
echo $*.d "\\" > $@
$(CXX) -MM $< $(DEPCXXFLAGS) >> $@
%.dtmp: %.template
@@ -669,8 +669,10 @@ $(srcdir)/configure: configure.in
# seems gmake needs at least a trivial command. otherwise all
# files which depend on config.h will be remade even if congig.h
# did not change.
-config.h: stamp-h
- @:
+#
+# WTF?
+#config.h: stamp-h
+# @:
stamp-h: config.h.in config.status
CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
@@ -683,7 +685,7 @@ config.status: configure
./config.status --recheck
# create cf_gmp.h
-cf_gmp.h: GNUmakefile gen_cf_gmp.template
+cf_gmp.h: gen_cf_gmp.template
echo "#!/bin/sh" >gen_cf_gmp.sh
echo "GMP_H_T=\"`$(CXX) $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
cat gen_cf_gmp.template >>gen_cf_gmp.sh
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 6f58083..78d2b07 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -253,12 +253,12 @@ p_Procs_Dynamic.o p_Procs_Lib.o p_Procs_Dynamic.og p_Procs_Lib.og\
p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
# here is how p_Procs_[Static|Dynamic].inc is generated
-p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+p_Procs_Static.inc: p_Procs_Generate.cc p_Procs_Impl.h
$(CXX) $(CPPFLAGS) -g -Dp_Procs_Static p_Procs_Generate.cc -o p_Procs_Static
./p_Procs_Static > p_Procs_Static.xx && mv p_Procs_Static.xx p_Procs_Static.inc
-rm -f p_Procs_Static p_Procs_Static.exe
-p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h |mod2.h
+p_Procs_Dynamic.inc: p_Procs_Generate.cc p_Procs_Impl.h
$(CXX) $(CPPFLAGS) -g -Dp_Procs_Dynamic p_Procs_Generate.cc -o p_Procs_Dynamic
./p_Procs_Dynamic > p_Procs_Dynamic.xx && mv p_Procs_Dynamic.xx p_Procs_Dynamic.inc
-rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
@@ -439,15 +439,15 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
## dependencies
##
-%.dd: %.cc mod2.h
+%.dd: %.cc
echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.dl_o) $(@:.dd=.dl_og) $(@:.dd=.dl_op)" " \\ > $@
$(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
-%.d: %.c mod2.h
+%.d: %.c
echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
$(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
+depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d)
cat *.d *.dd >depend
ifeq (depend,$(wildcard depend))
diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
index 8661ca2..1dd2e36 100644
--- a/omalloc/Makefile.in
+++ b/omalloc/Makefile.in
@@ -180,9 +180,9 @@ configure: configure.in
##
install-nolns: install
-install-libsingular:
- $(MKINSTALLDIRS) $(includedir)/singular
- $(INSTALL) omalloc.h $(includedir)/singular
+#install-libsingular:
+# $(MKINSTALLDIRS) $(includedir)/singular
+# $(INSTALL) omalloc.h $(includedir)/singular
install install-libsingular: all
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git
More information about the debian-science-commits
mailing list