Changeset 76178c in git

Timestamp:

Jan 22, 2015, 4:33:12 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1e210d65d8dc82cc829f8b88cf056d035bb9b311

Parents:

d181eea62bf528f5777c224499fbf26cccac5ff7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-22 16:33:12+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-01-22 18:57:37+01:00

Message:

Fix buildsystem to avoid rebuilding Singular executable due to changes in libraries + cleanup

File:

• Singular/Makefile.am (modified) (4 diffs)

Singular/Makefile.am

@@ -4 +4 @@
 
 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(FACTORY_INCLUDES)  $(GMP_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
+
+all-local: feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib gftables MOD ${abs_builddir}/LIB Singular ESingular TSingular
 
 SUBDIRS = dyn_modules
@@ -156 +158 @@
 bin_PROGRAMS = Singular ESingular TSingular $(optional_Singular_programs)
 
-# the following dependency leads to Singular relinking upon a library update!
-Singular ESingular TSingular $(optional_Singular_programs): ${abs_builddir}/LIB
-
 Singular_SOURCES = tesths.cc mmalloc.cc fegetopt.c fegetopt.h utils.cc  utils.h
 
@@ -233 +232 @@
 
 #########################################################
-### plural_cmd.inc
 # These files are built first
 BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc all.lib gftables MOD
-
 CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
 
@@ -253 +250 @@
         ${builddir}/feOptTS$(EXEEXT)
 
-# plural_cmd.inc is only necessary for documentation generation
-#plural_cmd.inc: gentable1$(EXEEXT)
-#       ${builddir}/gentable1$(EXEEXT) argument
-
 iparith.inc: gentable1$(EXEEXT) table.h
         ${builddir}/gentable1$(EXEEXT)