Changeset - r363:a637fb9d457b
« 362:515979
366:efbd0a »
gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Revert to the canonical way of customizing CXXFLAGS A default list of compiler flags is set via AM_CXXFLAGS Automake variable. However this gets overridden by per-target CXXFLAGS variables (e.g. foo_CXXFLAGS in case the foo target). Because of this you should append $(AM_CXXFLAGS) to the end of the per-target CXXFLAGS variables (e.g. foo_CXXFLAGS = ... $(AM_CXXFLAGS)). After this default list of flags the contents of the CXXFLAGS user variable is passed to the compiler. This variable has a default value determined by configure (in case of g++ it is '-g -O2'). You can override this by specifying CXXFLAGS when invoking make (e.g. make CXXFLAGS='-O3').
0 3 0
default
3 files changed with 7 insertions and 6 deletions:
Makefile.am
2
configure.ac
4
5
lemon/Makefile.am
1
1
↑ Collapse diff ↑
Makefile.am
Ignore white space 16 line context
1 1 
ACLOCAL_AMFLAGS = -I m4
2 2 

			




	
	3
	
		
AM_CXXFLAGS = $(WARNINGCXXFLAGS)


			




	
	4
	
		

			




	3
	5
	
		
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)


			




	4
	6
	
		
LDADD = $(top_builddir)/lemon/libemon.la


			




	5
	7
	
		

			




	6
	8
	
		
EXTRA_DIST = \


			




	7
	9
	
		
	AUTHORS \


			




	8
	10
	
		
	LICENSE \


			




	9
	11
	
		
	m4/lx_check_cplex.m4 \


			




	10
	12
	
		
	m4/lx_check_glpk.m4 \

			




        

    

    

    

        

            

                

                    configure.ac
                

                

                  
                  
                  
                  Ignore white space
                  16 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -14,18 +14,16 @@


			




	14
	14
	
		
AC_PREREQ([2.59])


			




	15
	15
	
		
AC_INIT([LEMON], [lemon_version()], [lemon-user@lemon.cs.elte.hu], [lemon])


			




	16
	16
	
		
AC_CONFIG_AUX_DIR([build-aux])


			




	17
	17
	
		
AC_CONFIG_MACRO_DIR([m4])


			




	18
	18
	
		
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])


			




	19
	19
	
		
AC_CONFIG_SRCDIR([lemon/list_graph.h])


			




	20
	20
	
		
AC_CONFIG_HEADERS([config.h lemon/config.h])


			




	21
	21
	
		

			




	22
	
	
		
lx_cmdline_cxxflags_set=${CXXFLAGS+set}


			




	23
	
	
		

			




	24
	22
	
		
dnl Do compilation tests using the C++ compiler.


			




	25
	23
	
		
AC_LANG([C++])


			




	26
	24
	
		

			




	27
	25
	
		
dnl Checks for programs.


			




	28
	26
	
		
AC_PROG_CXX


			




	29
	27
	
		
AC_PROG_CXXCPP


			




	30
	28
	
		
AC_PROG_INSTALL


			




	31
	29
	
		
AC_DISABLE_SHARED


			




	...
	...
	
		
@@ -41,19 +39,20 @@


			




	41
	39
	
		
#endif], [ICC=[yes]], [ICC=[no]])


			




	42
	40
	
		
if test x"$ICC" = x"yes"; then


			




	43
	41
	
		
  AC_MSG_RESULT([yes])


			




	44
	42
	
		
else


			




	45
	43
	
		
  AC_MSG_RESULT([no])


			




	46
	44
	
		
fi


			




	47
	45
	
		

			




	48
	46
	
		
dnl Set custom compiler flags when using g++.


			




	49
	
	
		
if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes -a "$ICC" = no; then


			




	50
	
	
		
  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"


			




	
	47
	
		
if test "$GXX" = yes -a "$ICC" = no; then


			




	
	48
	
		
  WARNINGCXXFLAGS="-Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"


			




	51
	49
	
		
fi


			




	
	50
	
		
AC_SUBST([WARNINGCXXFLAGS])


			




	52
	51
	
		

			




	53
	52
	
		
dnl Checks for libraries.


			




	54
	53
	
		
#LX_CHECK_GLPK


			




	55
	54
	
		
#LX_CHECK_CPLEX


			




	56
	55
	
		
#LX_CHECK_SOPLEX


			




	57
	56
	
		

			




	58
	57
	
		
dnl Disable/enable building the demo programs.


			




	59
	58
	
		
AC_ARG_ENABLE([demo],


			




	...
	...
	
		
@@ -108,17 +107,17 @@


			




	108
	107
	
		
AC_OUTPUT


			




	109
	108
	
		

			




	110
	109
	
		
echo


			




	111
	110
	
		
echo '****************************** SUMMARY ******************************'


			




	112
	111
	
		
echo


			




	113
	112
	
		
echo Package version............... : $PACKAGE-$VERSION


			




	114
	113
	
		
echo


			




	115
	114
	
		
echo C++ compiler.................. : $CXX


			




	116
	
	
		
echo C++ compiles flags............ : $CXXFLAGS


			




	
	115
	
		
echo C++ compiles flags............ : $WARNINGCXXFLAGS $CXXFLAGS


			




	117
	116
	
		
echo


			




	118
	117
	
		
#echo GLPK support.................. : $lx_glpk_found


			




	119
	118
	
		
#echo CPLEX support................. : $lx_cplex_found


			




	120
	119
	
		
#echo SOPLEX support................ : $lx_soplex_found


			




	121
	120
	
		
#echo


			




	122
	121
	
		
echo Build demo programs........... : $enable_demo


			




	123
	122
	
		
echo Build additional tools........ : $enable_tools


			




	124
	123
	
		
echo

			




        

    

    

    

        

            

                

                    lemon/Makefile.am
                

                

                  
                  
                  
                  Ignore white space
                  16 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -7,17 +7,17 @@


			




	7
	7
	
		
lib_LTLIBRARIES += lemon/libemon.la


			




	8
	8
	
		

			




	9
	9
	
		
lemon_libemon_la_SOURCES = \


			




	10
	10
	
		
        lemon/arg_parser.cc \


			




	11
	11
	
		
        lemon/base.cc \


			




	12
	12
	
		
        lemon/color.cc \


			




	13
	13
	
		
        lemon/random.cc


			




	14
	14
	
		

			




	15
	
	
		
#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)


			




	
	15
	
		
#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)


			




	16
	16
	
		
#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)


			




	17
	17
	
		

			




	18
	18
	
		
lemon_HEADERS += \


			




	19
	19
	
		
        lemon/arg_parser.h \


			




	20
	20
	
		
	lemon/assert.h \


			




	21
	21
	
		
        lemon/bfs.h \


			




	22
	22
	
		
        lemon/bin_heap.h \


			




	23
	23
	
		
        lemon/color.h \


			




        

    






    
    



    


    

     
    
0 comments (0 inline)