Minor BS cleanup: no need in -I${srcdir} and -I${builddir} in CPPFLAGS

Singular · Mar 19, 2014 · 38750a6 · 38750a6
1 parent 37e66f9
commit 38750a6
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
diff --git a/IntegerProgramming/Makefile.am b/IntegerProgramming/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-AM_CPPFLAGS = -I${srcdir} $(GMP_CFLAGS)
+AM_CPPFLAGS = $(GMP_CFLAGS)
 AM_LDFLAGS = $(GMP_LIBS)
 
 noinst_HEADERS = list.h binomial__term_ordering.h BigInt.h LLL.h matrix.h ideal.h binomial__term_ordering.h ideal.h \

diff --git a/dyn_modules/bigintm/Makefile.am b/dyn_modules/bigintm/Makefile.am
@@ -8,7 +8,7 @@ if ENABLE_P_PROCS_DYNAMIC
 
 endif
 
-MYINCLUDES =  -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 $(FACTORY_INCLUDES) $(RESOURCES_INCLUDES) $(OMALLOC_INCLUDES) \
 $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) 

diff --git a/dyn_modules/callgfanlib/Makefile.am b/dyn_modules/callgfanlib/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 SOURCES = bbcone.cc bbcone.h bbfan.cc bbfan.h bbpolytope.cc bbpolytope.h gfan.h gitfan.cc gitfan.h gfanlib.cc
 
-MYINCLUDES =  -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 

diff --git a/dyn_modules/callpolymake/Makefile.am b/dyn_modules/callpolymake/Makefile.am
@@ -18,7 +18,7 @@ CXXFLAGS += $(POLYMAKE_CXXFLAGS)
 
 polymake_la_SOURCES = $(SOURCES)
 
-MYINCLUDES = -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+MYINCLUDES = -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys  \
 $(PM_INC) $(PM_CFLAGS) $(POLYMAKE_CXXFLAGS) \
 $(FACTORY_INCLUDES) $(RESOURCES_INCLUDES) $(OMALLOC_INCLUDES) \

diff --git a/dyn_modules/syzextra/Makefile.am b/dyn_modules/syzextra/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 SOURCES = mod_main.cc DebugPrint.cc DebugPrint.h myNF.cc myNF.h singularxx_defs.h
 
-MYINCLUDES =  -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+MYINCLUDES =  -I${top_srcdir} -I${top_builddir} \
 -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
 $(FACTORY_INCLUDES) $(RESOURCES_INCLUDES) $(OMALLOC_INCLUDES) \
 $(FLINT_CFLAGS) $(NTL_CFLAGS) $(GMP_CFLAGS) $(GOOGLE_PERFTOOLS_CFLAGS)

diff --git a/factory/libfac/Makefile.am b/factory/libfac/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I ../../m4
 
 noinst_LTLIBRARIES=libfac.la 
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${builddir} -I${srcdir}/.. -I${builddir}/.. -I${srcdir}/../include  -I${builddir}/../include -I${srcdir}/factor  -I${builddir}/factor -I${srcdir}/charset -I${builddir}/charset ${GMP_CFLAGS} ${NTL_CFLAGS}  
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir}/.. -I${builddir}/.. -I${srcdir}/../include  -I${builddir}/../include -I${srcdir}/factor  -I${builddir}/factor -I${srcdir}/charset -I${builddir}/charset ${GMP_CFLAGS} ${NTL_CFLAGS}
 
 FACTORSRC1 =	factor/SqrFree.cc factor/Factor.cc \
 		factor/MVMultiHensel.cc factor/Truefactor.cc \

diff --git a/gfanlib/Makefile.in.save b/gfanlib/Makefile.in.save
@@ -35,7 +35,7 @@ PIPE		= -pipe
 CFLAGS		= -fpic @CFLAGS@ ${PIPE}
 CXXFLAGS	= -fpic @CXXFLAGS@ ${PIPE}
 #CXXTEMPLFLAGS	= -fno-implicit-templates --no-exceptions
-CPPFLAGS	= -I${srcdir} -I${includedir}
+CPPFLAGS	= -I${includedir}
 DEFS		= -DGMPRATIONAL
 
 ## End configuration dependend stuff

diff --git a/libpolys/coeffs/Makefile.am b/libpolys/coeffs/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \
 $(FACTORY_INCLUDES) $(OMALLOC_INCLUDES) $(RESOURCES_INCLUDES) \
 ${NTL_CFLAGS} $(FLINT_CFLAGS) ${GMP_CFLAGS}
 

diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-AM_CPPFLAGS	= -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+AM_CPPFLAGS	= -I${top_srcdir} -I${top_builddir} \
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 
 

diff --git a/libpolys/tests/Makefile.am b/libpolys/tests/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I ../../m4
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${srcdir} \
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \
 ${FACTORY_INCLUDES} ${RESOURCES_INCLUDES} ${OMALLOC_INCLUDES} \
 ${FLINT_CFLAGS} ${NTL_CFLAGS} ${GMP_CFLAGS} 
 

diff --git a/xalloc/Makefile.am b/xalloc/Makefile.am
@@ -12,8 +12,6 @@ noinst_LTLIBRARIES=libomalloc.la
 
 SOURCES = dummy.c omalloc.h
 
-AM_CPPFLAGS = -I${srcdir}  
-
 libomalloc_la_SOURCES  =$(SOURCES)
 
 libomalloc_la_LDFLAGS  = -release ${PACKAGE_VERSION}