On Thu, Aug 17, 2006 at 12:09:59AM +0200, Richard B. Kreckel wrote:
Richard Haney wrote:
Also, I would think a similar patch for examples/Makefile.in and benchmarks/Makefile.in would also be appropriate since the associated Makefiles are used to build executables in the associated directories.
I've applied a patch to this effect to the main branch.
Your patch seems to be somewhat incomplete. Could you please apply this one too? Index: cln-cvs/benchmarks/Makefile.in =================================================================== --- cln-cvs.orig/benchmarks/Makefile.in 2006-08-21 11:06:29.000000000 +0400 +++ cln-cvs/benchmarks/Makefile.in 2006-08-21 11:07:14.000000000 +0400 @@ -24,6 +24,7 @@ LN = ln RM = rm -f @SET_MAKE@ +EXEEXT = @EXEEXT@ #### End of system configuration section. #### @@ -54,7 +55,7 @@ MODULES_timebench2ap = timebench2ap MODULES_timebench2b = timebench2b -all : timebench2a timebench2ap timebench2b +all : $(addsuffix $(EXEEXT),timebench2a timebench2ap timebench2b) %.s : %.c ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ @@ -83,11 +84,11 @@ %.i.cc : %.cc ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ -timebench1 : $(patsubst %,%.o,${MODULES_timebench1}) -timebench2a : $(patsubst %,%.o,${MODULES_timebench2a}) -timebench2ap : $(patsubst %,%.o,${MODULES_timebench2ap}) -timebench2b : $(patsubst %,%.o,${MODULES_timebench2b}) -${PROGRAMS} : % : ${LIBDEPS} +timebench1$(EXEEXT) : $(patsubst %,%.o,${MODULES_timebench1}) +timebench2a$(EXEEXT) : $(patsubst %,%.o,${MODULES_timebench2a}) +timebench2ap$(EXEEXT) : $(patsubst %,%.o,${MODULES_timebench2ap}) +timebench2b$(EXEEXT) : $(patsubst %,%.o,${MODULES_timebench2b}) +${PROGRAMS} : %$(EXEEXT) : ${LIBDEPS} ${LIBTOOL_LINK} ${CXX} ${CXXFLAGS} ${TARGET_ARCH} $(patsubst %,%.o,$(MODULES_$(*F))) ${LDFLAGS} ${LIBS} -o $@ Index: cln-cvs/examples/Makefile.in =================================================================== --- cln-cvs.orig/examples/Makefile.in 2006-08-21 11:08:49.000000000 +0400 +++ cln-cvs/examples/Makefile.in 2006-08-21 11:10:51.000000000 +0400 @@ -27,6 +27,7 @@ LN = ln RM = rm -f @SET_MAKE@ +EXEEXT = @EXEEXT@ #### End of system configuration section. #### @@ -61,7 +62,7 @@ MODULES_perfnum = perfnum MODULES_pi = pi -all : contfrac e fibonacci legendre lucaslehmer nextprime perfnum pi +all : $(addsuffix $(EXEEXT), contfrac e fibonacci legendre lucaslehmer nextprime perfnum pi) %.s : %.c ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ @@ -81,15 +82,15 @@ %.i.cc : %.cc ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ -contfrac : $(patsubst %,%.o,${MODULES_contfrac}) -e : $(patsubst %,%.o,${MODULES_e}) -fibonacci : $(patsubst %,%.o,${MODULES_fibonacci}) -legendre : $(patsubst %,%.o,${MODULES_legendre}) -lucaslehmer : $(patsubst %,%.o,${MODULES_lucaslehmer}) -nextprime : $(patsubst %,%.o,${MODULES_nextprime}) -perfnum : $(patsubst %,%.o,${MODULES_perfnum}) -pi : $(patsubst %,%.o,${MODULES_pi}) -${PROGRAMS} : % : ${LIBDEPS} +contfrac$(EXEEXT) : $(patsubst %,%.o,${MODULES_contfrac}) +e$(EXEEXT) : $(patsubst %,%.o,${MODULES_e}) +fibonacci$(EXEEXT) : $(patsubst %,%.o,${MODULES_fibonacci}) +legendre$(EXEEXT) : $(patsubst %,%.o,${MODULES_legendre}) +lucaslehmer$(EXEEXT) : $(patsubst %,%.o,${MODULES_lucaslehmer}) +nextprime$(EXEEXT) : $(patsubst %,%.o,${MODULES_nextprime}) +perfnum$(EXEEXT) : $(patsubst %,%.o,${MODULES_perfnum}) +pi$(EXEEXT) : $(patsubst %,%.o,${MODULES_pi}) +${PROGRAMS} : %$(EXEEXT) : ${LIBDEPS} ${LIBTOOL_LINK} ${CXX} ${CXXFLAGS} ${TARGET_ARCH} $(patsubst %,%.o,$(MODULES_$(*F))) ${LDFLAGS} ${LIBS} -o $@ Best regards, Alexei. -- All science is either physics or stamp collecting.