[SCM] an open source computer algebra system branch, debian, updated. f2847def7083a28cb38fa1dc2482162bffd4740e
Bernhard R. Link
brlink at debian.org
Tue Mar 6 13:36:25 UTC 2012
The following commit has been merged in the debian branch:
commit af4059db26a97213b6f76ddc57e58f3b0afa79fa
Author: Bernhard R. Link <brlink at debian.org>
Date: Tue Mar 6 12:34:02 2012 +0100
clean up debian/rules
diff --git a/callpolymake/Makefile b/callpolymake/Makefile
deleted file mode 100755
index 0360f6e..0000000
--- a/callpolymake/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-PM_INC := $(shell polymake-config --includes)
-PM_CFLAGS := -fPIC -DPOLYMAKE_DEBUG=0
-PM_LIBS := $(shell polymake-config --libs)
-PM_LDFLAGS := $(shell polymake-config --ldflags)
-
-CFLAGS += -march=native
-LDFLAGS += -Wl,-rpath,/home/ren/polymake-2.9.10/build.x86_64/perlx-5.10.1-x86_64-linux-gnu-thread-multi/ -lxml2
-
-all: polymake
-
-polymake:
- g++ -o polymake.o -I. ${PM_INC} ${PM_CFLAGS} ${CFLAGS} ${PM_LDFLAGS} ${PM_LIBS} -I/home/ren/Sources/ -c -g polymake.cc
- g++ -shared -o polymake.so ${PM_INC} ${PM_CFLAGS} ${CFLAGS} ${PM_LDFLAGS} ${PM_LIBS} ${LDFLAGS} -lgmpxx -lgmp -g polymake.o
-
-clean:
- rm *.so *.o
-
diff --git a/debian/rules b/debian/rules
index 0d55195..89826dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,9 @@
#!/usr/bin/make -f
-DH_VERBOSE=1
+# DH_VERBOSE=1
-# fixme: fetch from changelog (how)?
+# soname-suffix of the library and part of directory name.
+# make sure to change the libsingular-* package name when changing this:
VERSION=3-1-4
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
@@ -10,7 +11,7 @@ CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wextra
+CFLAGS += -Wall
CXXFLAGS += -Wall
DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL \
@@ -25,30 +26,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += --with-apint=gmp --with-gmp=/usr/lib --disable-NTL
--with-factory=$(CURDIR)/factory \
--with-libfac=$(CURDIR)/libfac
-# common-install-impl::
-# +$(DEB_MAKE_INVOKE) libsingular
-# +$(DEB_MAKE_INVOKE) install-libsingular
-
-# binary-post-install/singular::
-# rm -f debian/singular/usr/bin/*.*o*
-
-#binary-post-install/libsingular-3-0-4-3::
-# chmod -x debian/*/usr/lib/singular/*.lib
-# chmod -x debian/*/usr/lib/singular/gftables/*
-
-#binary-post-install/libsingular-dev::
-# chmod -x debian/*/usr/include/singular/*.h
-# chmod -x debian/*/usr/include/singular/*.c
-# chmod -x debian/*/usr/include/singular/singular/*
-
-#binary-post-install/singular::
-# rm -f debian/singular/usr/lib/singular/*.so
-
-clean::
+clean:
if [ -f doc/Makefile ] ; then $(MAKE) -C doc clean ; fi
if [ -f Makefile ] ; then $(MAKE) distclean ; fi
rm -f *-stamp
-#?
dh_clean
rm -f VERSION
@@ -59,49 +40,27 @@ clean::
-o -name "QEPCAD*" -o -name "qepcadfilter.pl" \
-o -name "s-plulibs.tex" \) -delete
#sanity checks
- find . -name *.dl_o -exec echo clean failed \{\} \;
- find . -name *.o -exec echo clean failed \{\} \;
- find . -name *.og -exec echo clean failed \{\} \;
- find . -name *.so -exec echo clean failed \{\} \;
- find . -name *.a -exec echo clean failed \{\} \;
- find . -name *.o_ndebug -exec echo clean failed \{\} \;
- find . -name *.op -exec echo clean failed \{\} \;
-
- find . -name *.dl_o -exec rm \{\} \;
- find . -name *.o -exec rm \{\} \;
- find . -name *.og -exec rm \{\} \;
- find . -name *.so -exec rm \{\} \;
- find . -name *.a -exec rm \{\} \;
- find . -name *.o_ndebug -exec rm \{\} \;
- find . -name *.op -exec rm \{\} \;
- rm -f Singular/libparse.cc.lmp Singular/stamp-h doc/uname.texi doc/version.texi kernel/prCopy.inc
-
- rm -f dyn_modules/config.log
- rm -f dyn_modules/config.status
- rm -f dyn_modules/include/config.h
- rm -f dyn_modules/modgen/Makefile
- rm -f dyn_modules/tools/Makefile
- rm -f emacs/Makefile
+ find . \( -name "*.o" -o -name "*.dl_o" -o -name "*.og" \
+ -o -name "*.so" -o -name "*.sog" -o -name "*.a" \
+ -o -name "*.o_ndebug" -o -name "*.sog" -o -name "*.op" \) \
+ -printf 'clean failed: %p\n' -delete
+ # remove some leftovers:
+ rm -f Singular/libparse.cc.lmp doc/uname.texi doc/version.texi kernel/prCopy.inc
+ find . \( -name "config.guess" -o -name "config.sub" \
+ -o -name "config.log" -o -name "config.status" \
+ -o -name "stamp-h" -o -name "config.h" \
+ -o -name "Makefile" \) \
+ -delete
rm -f factory/gen_cf_gmp.sh
rm -f libfac/factor/version.h
- rm -f factory/config.log
-
-
- rm -f Singular/config.log
- rm -f Singular/config.status
rm -f Singular/conftest.s1
rm -f Singular/conftest.subs
rm -f Singular/mpsr_Tok.xx
- rm -f ntl/config.status
- rm -f ntl/include/NTL/config.h
rm -f ntl/src/cfileout
rm -f ntl/src/makefile
rm -f ntl/src/mfileout
- rm -f IntegerProgramming/Makefile
rm -f emacs/lib-temp
- rm -f config.guess config.sub
-
binary: binary-arch binary-indep
binary-indep:
build-indep:
@@ -211,8 +170,6 @@ install: build-stamp
dh_prep
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-libsingular templatedir='$${includedir}/factory/templates'
$(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install
- # TODO:
- # $(MAKE) -C Singular DESTDIR=$(CURDIR)/debian/tmp/ DL_LIBSG='' install-sharedist
$(MAKE) -C doc \
bindir="$(CURDIR)/Singular" \
SINGULAR='$(CURDIR)/Singular/Singular' \
diff --git a/factory/winnt/config.h b/factory/winnt/config.h
deleted file mode 100644
index 2a4fad4..0000000
--- a/factory/winnt/config.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* emacs edit mode for this file is -*- C -*- */
-/* $Id: config.h 12231 2009-11-02 10:12:22Z hannes $ */
-
-#ifndef INCL_CONFIG_H
-#define INCL_CONFIG_H
-
-/* {{{ docu
- *
- * config.h.in - used by `configure' to create `config.h'.
- *
- * This file is included at building time from almost all source
- * files belonging to Factory. Furthermore, it is (textually)
- * included into `factoryconf.h' by `makeheader' so we have an
- * installed version of this file, too. This way, the installed
- * source files will be compiled with the same settings as the
- * library itself.
- *
- * In general, you should let `configure' guess the correct
- * values for the `#define's below. But if something seriously
- * goes wrong in configuring, please inform the authors and feel
- * free to edit the marked section.
- *
- * ---RS---
- * This is the specialized version of config.h for compiling
- * Factory on Windows NT 4.0 with MS Visula C++ 5.x
- * ---RS---
- */
-/* }}} */
-
-/************** START OF CONFIGURABLE SECTION **************/
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define as __inline if that's what the C compiler calls it. */
-/* #undef inline */
-
-/* factory version */
-#define FACTORYVERSION "1.3b"
-
-/* factory configuration */
-#define FACTORYCONFIGURATION "WINNT"
-
-/* where the gftables live */
-#define GFTABLEDIR "."
-
-/* define if your compiler does arithmetic shift */
-#define HAS_ARITHMETIC_SHIFT 1
-
-/* define to build factory without stream IO */
-#undef NOSTREAMIO
-
-/* define if linked to Singular */
-#undef SINGULAR
-
-/* define if linked with factory memory manager */
-#define USE_MEMUTIL 1
-
-/* define if linked with old factory memory manager */
-#define USE_OLD_MEMMAN 1
-
-/* define if linked with new factory manager, debugging version */
-#undef MDEBUG
-
-/* define if you do not want to activate assertions */
-#undef NOASSERT
-
-/* define if you want to activate the timing stuff */
-#undef TIMING
-
-/* define if you want to have debugging output */
-#undef DEBUGOUTPUT
-
-/* define type of your compilers 64 bit integer type */
-#define INT64 __int64
-
-/************** END OF CONFIGURABLE SECTION **************/
-
-#endif /* ! INCL_CONFIG_H */
diff --git a/kernel/stamp-h b/kernel/stamp-h
deleted file mode 100644
index 9788f70..0000000
--- a/kernel/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/omalloc/Misc/dlmalloc/Makefile b/omalloc/Misc/dlmalloc/Makefile
deleted file mode 100644
index c6fb2f5..0000000
--- a/omalloc/Misc/dlmalloc/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-CC = cc
-CCC = CC
-CFLAGS = -O2
-RM = rm -f
-DISTFILES = COPYRIGHT Makefile malloc-trace.c malloc-trace.h \
- print-trace.c trace-test.c
-
-.c.o:
- $(CC) $(CFLAGS) -c $<
-
-.cc.o:
- $(CCC) $(CFLAGS) -c $<
-
-all:
- @echo "Type make <os> to create a shared object malloc-trace.so."
- @echo "<os> can be \`linux' or \`sgi' currently."
-
-malloc-trace.o: malloc.c
-
-malloc.c:
- @echo "Please create a symbolic link from the malloc source"
- @echo "that you want to use to 'malloc.c'."
- @exit 1
-
-linux: malloc.c
- $(CC) -Wall $(CFLAGS) -fpic -shared -o malloc-trace.so malloc-trace.c
-
-sgi: malloc-trace.o
- $(CC) -shared -o malloc-trace.so malloc-trace.o -lc
- $(RM) so_locations
-
-trace-test:
- $(CC) $(CFLAGS) trace-test.c -o trace-test
-
-print-trace:
- $(CC) $(CFLAGS) print-trace.c -o print-trace
-
-dist:
- tar cf - $(DISTFILES) | gzip -9 > ../mtrace.tgz
--
an open source computer algebra system
More information about the debian-science-commits
mailing list