From 0e4d27ec4d6f55678c97452077d204d325451e04 Mon Sep 17 00:00:00 2001 From: jmerelo Date: Fri, 15 Oct 1999 07:34:55 +0000 Subject: [PATCH] Small changes to makefiles --- eo/configure.in | 2 +- eo/src/Makefile.am | 2 +- eo/test/Makefile.am | 2 +- eo/test/Makefile.in | 13 ++++++------- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eo/configure.in b/eo/configure.in index 8bd8183c9..0025aabc3 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -1,6 +1,6 @@ AC_INIT(src/eo) -AM_INIT_AUTOMAKE(eo, 0.0.1) +AM_INIT_AUTOMAKE(eo, 0.0.3) AC_PROG_CXX diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am index e08406085..a9c52e8a9 100644 --- a/eo/src/Makefile.am +++ b/eo/src/Makefile.am @@ -8,5 +8,5 @@ lib_LIBRARIES = libeo.a libeo_a_SOURCES = eoPrintable.cpp eoPersistent.cpp libeoincdir = $(includedir)/eo -libeoinc_HEADERS = eo EO.h eoDup.h eoMultiMonOp.h eoPop.h eoUniform.h eoESChrom.h eoNegExp.h eoProblem.h eoVector.h eoFitness.h eoNormal.h eoRnd.h eoXOver2.h eo1d.h eoID.h eoObject.h eoString.h eoAged.h eoKill.h eoOp.h eoTranspose.h eoBin.h eoPrintable.h eoPersistent.h eoLottery.h eoMutation.h eoPopOps.h eoUniform.h eoInsertion.h eoInclusion.h eoBitOp.h eoBitOpFactory.h eo2d.h eo2dVector.h eoData.h eoProportionalOpSel.h eoOpSelector.h eoBreeder.h eoEvalFunc.h eoEvalFuncPtr.h eoEvaluator.h eoTerm.h eoGenTerm.h eoFitTerm.h eoGeneration.h eoAlgo.h eoEasyEA.h +libeoinc_HEADERS = eo EO.h eoDup.h eoMultiMonOp.h eoPop.h eoUniform.h eoESChrom.h eoNegExp.h eoProblem.h eoVector.h eoFitness.h eoNormal.h eoRnd.h eoXOver2.h eo1d.h eoID.h eoObject.h eoString.h eoAged.h eoKill.h eoOp.h eoTranspose.h eoBin.h eoPrintable.h eoPersistent.h eoLottery.h eoMutation.h eoPopOps.h eoUniform.h eoInsertion.h eoInclusion.h eoBitOp.h eoBitOpFactory.h eo2d.h eo2dVector.h eoData.h eoProportionalOpSel.h eoOpSelector.h eoBreeder.h eoEvalFunc.h eoEvalFuncPtr.h eoEvaluator.h eoTerm.h eoGenTerm.h eoFitTerm.h eoGeneration.h eoAlgo.h eoEasyEA.h eoNonUniform.h diff --git a/eo/test/Makefile.am b/eo/test/Makefile.am index 43c6df123..fd1887290 100644 --- a/eo/test/Makefile.am +++ b/eo/test/Makefile.am @@ -30,7 +30,7 @@ t_eogeneration_LDADD = $(LDADDS) ############################################################################### -t_eoEasyEA_SOURCES = t-eoEasyEA.cpp +t_eoEasyEA_SOURCES = t-eoEasyEA.cpp binary_value.h t_eoEasyEA_DEPENDENCIES = $(DEPS) t_eoEasyEA_LDFLAGS = -lm t_eoEasyEA_LDADD = $(LDADDS) diff --git a/eo/test/Makefile.in b/eo/test/Makefile.in index 64d307ff0..1dab5b481 100644 --- a/eo/test/Makefile.in +++ b/eo/test/Makefile.in @@ -62,17 +62,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ CC = @CC@ CXX = @CXX@ -DLLTOOL = @DLLTOOL@ -LD = @LD@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -NM = @NM@ -OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ @@ -103,7 +97,7 @@ t_eogeneration_LDADD = $(LDADDS) ############################################################################### -t_eoEasyEA_SOURCES = t-eoEasyEA.cpp +t_eoEasyEA_SOURCES = t-eoEasyEA.cpp binary_value.h t_eoEasyEA_DEPENDENCIES = $(DEPS) t_eoEasyEA_LDFLAGS = -lm t_eoEasyEA_LDADD = $(LDADDS) @@ -196,6 +190,11 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in