diff --git a/ChangeLog b/ChangeLog index 3b3921b..05f17d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-08-15 Richard B. Kreckel + + * tests/Makefile.in: MinGW support for make check + (Patch by Sheplyakov Alexei to add ${EXEEXT}). + * Makefile.in: Convert from $(VAR) to ${VAR} syntax. + * benchmarks/Makefile.in: Likewise. + * doc/Makefile.in: Likewise. + * examples/Makefile.in: Likewise. + * src/Makefile.in: Likewise. + * tests/Makefile.in: Likewise. + 2006-08-06 Richard B. Kreckel * configure.ac: Re-enable shared lib on non-MinGW platforms, sigh. diff --git a/Makefile.in b/Makefile.in index d6787f7..bd56856 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,50 +31,50 @@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh all : force - cd @subdir@ && $(MAKE) all + cd @subdir@ && ${MAKE} all install : installdirs force - cd @subdir@ && $(MAKE) install - $(INSTALL_SCRIPT) cln-config $(DESTDIR)$(bindir)/cln-config - $(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1 - $(INSTALL_DATA) ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4 - $(INSTALL_DATA) cln.pc $(DESTDIR)$(libdir)/pkgconfig/cln.pc + cd @subdir@ && ${MAKE} install + ${INSTALL_SCRIPT} cln-config ${DESTDIR}${bindir}/cln-config + ${INSTALL_DATA} cln-config.1 ${DESTDIR}${mandir}/man1/cln-config.1 + ${INSTALL_DATA} ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4 + ${INSTALL_DATA} cln.pc ${DESTDIR}${libdir}/pkgconfig/cln.pc installdirs : force - cd @subdir@ && $(MAKE) installdirs - $(MKDIR) $(DESTDIR)$(mandir)/man1 - $(MKDIR) $(DESTDIR)$(datadir)/aclocal - $(MKDIR) $(DESTDIR)$(bindir) - $(MKDIR) $(DESTDIR)$(libdir)/pkgconfig + cd @subdir@ && ${MAKE} installdirs + ${MKDIR} ${DESTDIR}${mandir}/man1 + ${MKDIR} ${DESTDIR}${datadir}/aclocal + ${MKDIR} ${DESTDIR}${bindir} + ${MKDIR} ${DESTDIR}${libdir}/pkgconfig uninstall : force - cd @subdir@ && $(MAKE) uninstall - $(RM) $(DESTDIR)$(bindir)/cln-config - $(RM) $(DESTDIR)$(mandir)/man1/cln-config.1 - $(RM) $(DESTDIR)$(datadir)/aclocal/cln.m4 - $(RM) $(DESTDIR)$(libdir)/pkgconfig/cln.pc + cd @subdir@ && ${MAKE} uninstall + ${RM} ${DESTDIR}${bindir}/cln-config + ${RM} ${DESTDIR}${mandir}/man1/cln-config.1 + ${RM} ${DESTDIR}${datadir}/aclocal/cln.m4 + ${RM} ${DESTDIR}${libdir}/pkgconfig/cln.pc check : force - cd @subdir@ && $(MAKE) check + cd @subdir@ && ${MAKE} check mostlyclean : force - cd @subdir@ && $(MAKE) mostlyclean + cd @subdir@ && ${MAKE} mostlyclean clean : force - cd @subdir@ && $(MAKE) clean + cd @subdir@ && ${MAKE} clean distclean : force - cd @subdir@ && if test -f Makefile; then $(MAKE) distclean; fi - $(RM) config.status config.log config.cache Makefile - $(RM) cln-config cln-config.1 cln.pc - $(RM) libtool - $(RM) include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h + cd @subdir@ && if test -f Makefile; then ${MAKE} distclean; fi + ${RM} config.status config.log config.cache Makefile + ${RM} cln-config cln-config.1 cln.pc + ${RM} libtool + ${RM} include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h maintainer-clean : force - cd @subdir@ && if test -f Makefile; then $(MAKE) maintainer-clean; fi - $(RM) config.status config.log config.cache Makefile - $(RM) cln-config cln-config.1 cln.spec cln.pc - $(RM) libtool - $(RM) include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h + cd @subdir@ && if test -f Makefile; then ${MAKE} maintainer-clean; fi + ${RM} config.status config.log config.cache Makefile + ${RM} cln-config cln-config.1 cln.spec cln.pc + ${RM} libtool + ${RM} include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h force : diff --git a/benchmarks/Makefile.in b/benchmarks/Makefile.in index 0f2ebb4..532e62e 100644 --- a/benchmarks/Makefile.in +++ b/benchmarks/Makefile.in @@ -16,10 +16,10 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(srcdir) -override CPPFLAGS += $(INCLUDES) +INCLUDES = -I../include -I${top_srcdir}/include -I${top_srcdir}/src -I${srcdir} +override CPPFLAGS += ${INCLUDES} LIBTOOL = @LIBTOOL@ -LIBTOOL_LINK = $(LIBTOOL) --mode=link +LIBTOOL_LINK = ${LIBTOOL} --mode=link MV = mv LN = ln RM = rm -f @@ -29,21 +29,21 @@ RM = rm -f SHELL = /bin/sh -# Needed by $(LIBTOOL). +# Needed by ${LIBTOOL}. top_builddir = .. -VPATH = $(srcdir) +VPATH = ${srcdir} -FILES_CC := $(notdir $(wildcard $(srcdir)/*.cc)) -FILES_CC := $(filter-out %.i.cc, $(FILES_CC)) +FILES_CC := $(notdir $(wildcard ${srcdir}/*.cc)) +FILES_CC := $(filter-out %.i.cc, ${FILES_CC}) -FILES_I_CC := $(patsubst %.cc,%.i.cc,$(FILES_CC)) +FILES_I_CC := $(patsubst %.cc,%.i.cc,${FILES_CC}) -FILES_S := $(patsubst %.cc,%.s,$(FILES_CC)) +FILES_S := $(patsubst %.cc,%.s,${FILES_CC}) -FILES_O := $(patsubst %.cc,%.o,$(FILES_CC)) +FILES_O := $(patsubst %.cc,%.o,${FILES_CC}) -OBJECTS = $(FILES_O) +OBJECTS = ${FILES_O} LIBS = ../src/libcln.la -lm LIBDEPS = ../src/libcln.la @@ -57,38 +57,38 @@ MODULES_timebench2b = timebench2b all : timebench2a timebench2ap timebench2b %.s : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ %.s : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ ifdef notyet %.o : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ %.o : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ else -$(FILES_O) : %.o : %.s - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ +${FILES_O} : %.o : %.s + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ endif %.i : %.c - $(CPP) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CPP} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ %.i.cc : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${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) - $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) $(TARGET_ARCH) $(patsubst %,%.o,$(MODULES_$(*F))) $(LDFLAGS) $(LIBS) -o $@ +timebench1 : $(patsubst %,%.o,${MODULES_timebench1}) +timebench2a : $(patsubst %,%.o,${MODULES_timebench2a}) +timebench2ap : $(patsubst %,%.o,${MODULES_timebench2ap}) +timebench2b : $(patsubst %,%.o,${MODULES_timebench2b}) +${PROGRAMS} : % : ${LIBDEPS} + ${LIBTOOL_LINK} ${CXX} ${CXXFLAGS} ${TARGET_ARCH} $(patsubst %,%.o,$(MODULES_$(*F))) ${LDFLAGS} ${LIBS} -o $@ install : all @@ -102,11 +102,11 @@ check : all mostlyclean : clean clean : force - $(RM) *.s *.o *.a $(PROGRAMS) a.out core - $(RM) -r .libs _libs + ${RM} *.s *.o *.a ${PROGRAMS} a.out core + ${RM} -r .libs _libs distclean : clean - $(RM) config.status config.log config.cache Makefile + ${RM} config.status config.log config.cache Makefile maintainer-clean : distclean diff --git a/doc/Makefile.in b/doc/Makefile.in index 7639858..914c360 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -13,8 +13,8 @@ datarootdir = @datarootdir@ datadir = @datadir@ infodir = @infodir@ mandir = @mandir@ -htmldir = $(datadir)/html -dvidir = $(datadir)/dvi +htmldir = ${datadir}/html +dvidir = ${datadir}/dvi DESTDIR = # Programs used by "make": @@ -41,84 +41,84 @@ PACKAGE = cln SHELL = /bin/sh -VPATH = $(srcdir) +VPATH = ${srcdir} all : info dvi ps html -info : $(srcdir)/$(PACKAGE).info +info : ${srcdir}/${PACKAGE}.info -$(srcdir)/$(PACKAGE).info : $(srcdir)/$(PACKAGE).texi - cd $(srcdir) && $(MAKEINFO) --no-split $(PACKAGE).texi +${srcdir}/${PACKAGE}.info : ${srcdir}/${PACKAGE}.texi + cd ${srcdir} && ${MAKEINFO} --no-split ${PACKAGE}.texi -$(srcdir)/$(PACKAGE).texi : $(srcdir)/$(PACKAGE).tex +${srcdir}/${PACKAGE}.texi : ${srcdir}/${PACKAGE}.tex cp $< $@ - $(EMACS) -batch $@ -load addnodes.el -f save-buffer + ${EMACS} -batch $@ -load addnodes.el -f save-buffer mv $@ $@~ sed -e 's,@detailmenu,,g' -e 's,@end detailmenu,,g' < $@~ > $@ - $(RM) $@~ + ${RM} $@~ -dvi : $(srcdir)/$(PACKAGE).dvi +dvi : ${srcdir}/${PACKAGE}.dvi -$(srcdir)/$(PACKAGE).dvi : $(srcdir)/$(PACKAGE).texi - cd $(srcdir) && $(TEXI2DVI) $(PACKAGE).texi +${srcdir}/${PACKAGE}.dvi : ${srcdir}/${PACKAGE}.texi + cd ${srcdir} && ${TEXI2DVI} ${PACKAGE}.texi -ps : $(srcdir)/$(PACKAGE).ps +ps : ${srcdir}/${PACKAGE}.ps -$(srcdir)/$(PACKAGE).ps : $(srcdir)/$(PACKAGE).dvi - $(DVIPS) -o $@ $< +${srcdir}/${PACKAGE}.ps : ${srcdir}/${PACKAGE}.dvi + ${DVIPS} -o $@ $< -html : $(PACKAGE).html $(PACKAGE)_toc.html +html : ${PACKAGE}.html ${PACKAGE}_toc.html -$(PACKAGE).html : $(srcdir)/$(PACKAGE).texi - cd $(srcdir) && $(TEXI2HTML) -expandinfo -number -monolithic $(PACKAGE).texi +${PACKAGE}.html : ${srcdir}/${PACKAGE}.texi + cd ${srcdir} && ${TEXI2HTML} -expandinfo -number -monolithic ${PACKAGE}.texi -$(PACKAGE)_toc.html : $(srcdir)/$(PACKAGE).texi - cd $(srcdir) && $(TEXI2HTML) -expandinfo -number -split_chapter $(PACKAGE).texi +${PACKAGE}_toc.html : ${srcdir}/${PACKAGE}.texi + cd ${srcdir} && ${TEXI2HTML} -expandinfo -number -split_chapter ${PACKAGE}.texi install : all installdirs force - $(INSTALL_DATA) $(srcdir)/$(PACKAGE).info $(DESTDIR)$(infodir)/$(PACKAGE).info + ${INSTALL_DATA} ${srcdir}/${PACKAGE}.info ${DESTDIR}${infodir}/${PACKAGE}.info @if (install-info --version && \ install-info --version 2>&1 | sed 1q | fgrep -i -v debian) >/dev/null 2>&1; then \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info";\ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(PACKAGE).info || :;\ + echo " install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info";\ + install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info || :;\ else : ; fi - $(INSTALL_DATA) $(srcdir)/$(PACKAGE)_*.html $(DESTDIR)$(htmldir) - $(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi + ${INSTALL_DATA} ${srcdir}/${PACKAGE}_*.html ${DESTDIR}${htmldir} + ${INSTALL_DATA} ${srcdir}/${PACKAGE}.dvi ${DESTDIR}${dvidir}/${PACKAGE}.dvi installdirs : force - $(MKDIR) $(DESTDIR)$(datadir) - $(MKDIR) $(DESTDIR)$(infodir) - $(MKDIR) $(DESTDIR)$(htmldir) - $(MKDIR) $(DESTDIR)$(dvidir) + ${MKDIR} ${DESTDIR}${datadir} + ${MKDIR} ${DESTDIR}${infodir} + ${MKDIR} ${DESTDIR}${htmldir} + ${MKDIR} ${DESTDIR}${dvidir} uninstall : force @if (install-info --version && \ install-info --version 2>&1 | sed 1q | fgrep -i -v debian) >/dev/null 2>&1; then \ - echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(PACKAGE).info"; \ - install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(PACKAGE).info; \ + echo " install-info --info-dir=${DESTDIR}${infodir} --remove ${DESTDIR}${infodir}/${PACKAGE}.info"; \ + install-info --info-dir=${DESTDIR}${infodir} --remove ${DESTDIR}${infodir}/${PACKAGE}.info; \ else :; fi - $(RM) $(DESTDIR)$(infodir)/$(PACKAGE).info - $(RM) $(DESTDIR)$(htmldir)/$(PACKAGE)_*.html - $(RM) $(DESTDIR)$(dvidir)/$(PACKAGE).dvi + ${RM} ${DESTDIR}${infodir}/${PACKAGE}.info + ${RM} ${DESTDIR}${htmldir}/${PACKAGE}_*.html + ${RM} ${DESTDIR}${dvidir}/${PACKAGE}.dvi check : all mostlyclean : clean clean : force - $(RM) *~ *.aux *.toc *.cp *.fn *.ky *.pg *.tp *.vr *.my *.mys *.log core + ${RM} *~ *.aux *.toc *.cp *.fn *.ky *.pg *.tp *.vr *.my *.mys *.log core distclean : clean - $(RM) Makefile + ${RM} Makefile maintainer-clean : distclean - $(RM) *.info *.dvi *.ps *.html - if [ -f $(PACKAGE).tex ] ; then $(RM) $(PACKAGE).texi ; fi + ${RM} *.info *.dvi *.ps *.html + if [ -f ${PACKAGE}.tex ] ; then ${RM} ${PACKAGE}.texi ; fi force : diff --git a/examples/Makefile.in b/examples/Makefile.in index baf3b9f..abb4217 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -19,10 +19,10 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -override CPPFLAGS += $(INCLUDES) +INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} +override CPPFLAGS += ${INCLUDES} LIBTOOL = @LIBTOOL@ -LIBTOOL_LINK = $(LIBTOOL) --mode=link +LIBTOOL_LINK = ${LIBTOOL} --mode=link MV = mv LN = ln RM = rm -f @@ -32,21 +32,21 @@ RM = rm -f SHELL = /bin/sh -# Needed by $(LIBTOOL). +# Needed by ${LIBTOOL}. top_builddir = .. -VPATH = $(srcdir) +VPATH = ${srcdir} -FILES_CC := $(notdir $(wildcard $(srcdir)/*.cc)) -FILES_CC := $(filter-out %.i.cc, $(FILES_CC)) +FILES_CC := $(notdir $(wildcard ${srcdir}/*.cc)) +FILES_CC := $(filter-out %.i.cc, ${FILES_CC}) -FILES_I_CC := $(patsubst %.cc,%.i.cc,$(FILES_CC)) +FILES_I_CC := $(patsubst %.cc,%.i.cc,${FILES_CC}) -FILES_S := $(patsubst %.cc,%.s,$(FILES_CC)) +FILES_S := $(patsubst %.cc,%.s,${FILES_CC}) -FILES_O := $(patsubst %.cc,%.o,$(FILES_CC)) +FILES_O := $(patsubst %.cc,%.o,${FILES_CC}) -OBJECTS = $(FILES_O) +OBJECTS = ${FILES_O} LIBS = ../src/libcln.la -lm LIBDEPS = ../src/libcln.la @@ -64,33 +64,33 @@ MODULES_pi = pi all : contfrac e fibonacci legendre lucaslehmer nextprime perfnum pi %.s : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ %.s : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ %.o : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ %.o : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ %.i : %.c - $(CPP) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CPP} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ %.i.cc : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${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) - $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) $(TARGET_ARCH) $(patsubst %,%.o,$(MODULES_$(*F))) $(LDFLAGS) $(LIBS) -o $@ +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} + ${LIBTOOL_LINK} ${CXX} ${CXXFLAGS} ${TARGET_ARCH} $(patsubst %,%.o,$(MODULES_$(*F))) ${LDFLAGS} ${LIBS} -o $@ install : all @@ -104,11 +104,11 @@ check : all mostlyclean : clean clean : force - $(RM) *.s *.o *.a $(PROGRAMS) a.out core - $(RM) -r .libs _libs + ${RM} *.s *.o *.a ${PROGRAMS} a.out core + ${RM} -r .libs _libs distclean : clean - $(RM) config.status config.log config.cache Makefile + ${RM} config.status config.log config.cache Makefile maintainer-clean : distclean diff --git a/src/Makefile.in b/src/Makefile.in index b11d4f7..51fa167 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -27,15 +27,15 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -override CPPFLAGS += $(INCLUDES) +INCLUDES = -I../include -I${top_srcdir}/include +override CPPFLAGS += ${INCLUDES} LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile -LIBTOOL_LINK = $(LIBTOOL) --mode=link -LIBTOOL_INSTALL = $(LIBTOOL) --mode=install -LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall +LIBTOOL_COMPILE = ${LIBTOOL} --mode=compile +LIBTOOL_LINK = ${LIBTOOL} --mode=link +LIBTOOL_INSTALL = ${LIBTOOL} --mode=install +LIBTOOL_UNINSTALL = ${LIBTOOL} --mode=uninstall AR = ar AR_FLAGS = rc RANLIB = @RANLIB@ @@ -58,7 +58,7 @@ INSTALL_DATA = @INSTALL_DATA@ SHELL = /bin/sh -# Needed by $(LIBTOOL). +# Needed by ${LIBTOOL}. top_builddir = .. # When this Makefile is called with SUBDIR=some_subdirectory, it builds @@ -67,62 +67,62 @@ top_builddir = .. SUBDIR = . # Define the search path for sources. -# The variable $(aux_srcdir) is needed because new versions of aufoconf tend to -# remove $(srcdir), ${srcdir} and so on... +# The variable ${aux_srcdir} is needed because new versions of aufoconf tend to +# remove ${srcdir}, ${srcdir} and so on... aux_srcdir = @srcdir@ -VPATH = $(aux_srcdir)/$(SUBDIR) +VPATH = ${aux_srcdir}/${SUBDIR} # Add subdirectory specific flags. -include $(srcdir)/$(SUBDIR)/Makeflags -override CPPFLAGS += $(SUBDIR_INCLUDES) +include ${srcdir}/${SUBDIR}/Makeflags +override CPPFLAGS += ${SUBDIR_INCLUDES} # Need to know the system name. SYSTEM := $(shell uname -s) -FILES_CC := $(notdir $(wildcard $(srcdir)/$(SUBDIR)/*.cc)) -FILES_CC := $(filter-out %.i.cc, $(FILES_CC)) -ASMFILES_CC := $(patsubst cl_asm_@host_cpu@_%.cc,cl_asm_%.cc, $(filter cl_asm_@host_cpu@_%.cc, $(FILES_CC))) -FILES_CC := $(filter-out cl_asm_%.cc, $(FILES_CC)) +FILES_CC := $(notdir $(wildcard ${srcdir}/${SUBDIR}/*.cc)) +FILES_CC := $(filter-out %.i.cc, ${FILES_CC}) +ASMFILES_CC := $(patsubst cl_asm_@host_cpu@_%.cc,cl_asm_%.cc, $(filter cl_asm_@host_cpu@_%.cc, ${FILES_CC})) +FILES_CC := $(filter-out cl_asm_%.cc, ${FILES_CC}) -FILES_I_CC := $(patsubst %.cc,%.i.cc,$(FILES_CC)) +FILES_I_CC := $(patsubst %.cc,%.i.cc,${FILES_CC}) -FILES_S := $(patsubst %.cc,%.s,$(FILES_CC)) +FILES_S := $(patsubst %.cc,%.s,${FILES_CC}) -FILES_LO := $(patsubst %.cc,%.lo,$(FILES_CC)) +FILES_LO := $(patsubst %.cc,%.lo,${FILES_CC}) -ASMFILES_S := $(patsubst %.cc,%.s,$(ASMFILES_CC)) +ASMFILES_S := $(patsubst %.cc,%.s,${ASMFILES_CC}) -ASMFILES_LO := $(patsubst %.cc,%.lo,$(ASMFILES_CC)) +ASMFILES_LO := $(patsubst %.cc,%.lo,${ASMFILES_CC}) -OBJECTS_LO = $(FILES_LO) $(ASMFILES_LO) +OBJECTS_LO = ${FILES_LO} ${ASMFILES_LO} -SUBDIRS := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/$(SUBDIR)/*/.)) +SUBDIRS := $(patsubst ${srcdir}/%/.,%,$(wildcard ${srcdir}/${SUBDIR}/*/.)) # Avoid certain subdirectories: # private/ and old/ don't contain valid sources, # CVS/, RCS/ and SCCS/ are created when people put the sources under version control, # ii_files/ is created during "make" by SGI C++. -SUBDIRS := $(filter-out old ./old private ./private CVS %/CVS RCS %/RCS SCCS %/SCCS ii_files ./ii_files,$(SUBDIRS)) +SUBDIRS := $(filter-out old ./old private ./private CVS %/CVS RCS %/RCS SCCS %/SCCS ii_files ./ii_files,${SUBDIRS}) -SUBDIRS_TARGET := $(patsubst %,%.target,$(SUBDIRS)) -SUBDIRS_DIRDEP := $(patsubst %,%.dirdep,$(SUBDIRS)) +SUBDIRS_TARGET := $(patsubst %,%.target,${SUBDIRS}) +SUBDIRS_DIRDEP := $(patsubst %,%.dirdep,${SUBDIRS}) -ifeq ($(SUBDIR),.) -ALLFILES_CC := $(notdir $(wildcard $(srcdir)/*.cc) $(foreach subdir,$(SUBDIRS), $(wildcard $(srcdir)/$(subdir)/*.cc) $(wildcard $(srcdir)/$(subdir)/*/*.cc) $(wildcard $(srcdir)/$(subdir)/*/*/*.cc))) -ALLFILES_CC := $(filter-out %.i.cc, $(ALLFILES_CC)) -ALLASMFILES_CC := $(patsubst cl_asm_@host_cpu@_%.cc,cl_asm_%.cc, $(filter cl_asm_@host_cpu@_%.cc, $(ALLFILES_CC))) -ALLFILES_CC := $(filter-out cl_asm_%.cc, $(ALLFILES_CC)) -ALLFILES_LO := $(patsubst %.cc,%.lo,$(ALLFILES_CC)) -ALLASMFILES_LO := $(patsubst %.cc,%.lo,$(ALLASMFILES_CC)) -ALLOBJECTS_LO = $(ALLFILES_LO) $(ALLASMFILES_LO) +ifeq (${SUBDIR},.) +ALLFILES_CC := $(notdir $(wildcard ${srcdir}/*.cc) $(foreach subdir,${SUBDIRS}, $(wildcard ${srcdir}/${subdir}/*.cc) $(wildcard ${srcdir}/${subdir}/*/*.cc) $(wildcard ${srcdir}/${subdir}/*/*/*.cc))) +ALLFILES_CC := $(filter-out %.i.cc, ${ALLFILES_CC}) +ALLASMFILES_CC := $(patsubst cl_asm_@host_cpu@_%.cc,cl_asm_%.cc, $(filter cl_asm_@host_cpu@_%.cc, ${ALLFILES_CC})) +ALLFILES_CC := $(filter-out cl_asm_%.cc, ${ALLFILES_CC}) +ALLFILES_LO := $(patsubst %.cc,%.lo,${ALLFILES_CC}) +ALLASMFILES_LO := $(patsubst %.cc,%.lo,${ALLASMFILES_CC}) +ALLOBJECTS_LO = ${ALLFILES_LO} ${ALLASMFILES_LO} -all : $(OBJECTS_LO) $(SUBDIRS_TARGET) libcln.la +all : ${OBJECTS_LO} ${SUBDIRS_TARGET} libcln.la else -all : $(OBJECTS_LO) $(SUBDIRS_TARGET) +all : ${OBJECTS_LO} ${SUBDIRS_TARGET} endif -alls : $(FILES_S) $(ASMFILES_S) +alls : ${FILES_S} ${ASMFILES_S} -allo : $(FILES_LO) $(ASMFILES_LO) +allo : ${FILES_LO} ${ASMFILES_LO} ASMFLAGS := @ASMFLAGS@ ifeq (@AS_UNDERSCORE@,true) @@ -132,107 +132,107 @@ endif # Rules for normal compilation. %.lo : %.c - $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< + ${LIBTOOL_COMPILE} ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< %.lo : %.cc - $(LIBTOOL_COMPILE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< + ${LIBTOOL_COMPILE} ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< # Rules for normal compilation, only needed for debugging. %.s : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ %.s : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ # Rules for preprocessing. %.i : %.c - $(CPP) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CPP} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ %.i.cc : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ # Rules for assembly language files, -ifneq ($(ASMFILES_LO),) +ifneq (${ASMFILES_LO},) ifneq ($(filter @host_cpu@,sparc sparc64),) -$(ASMFILES_S) : %.s : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $(ASMFLAGS) $< | grep -v '^#' | grep -v '^ *#line' | sed -e 's/\([.%]\) /\1/g' -e 's/ , /,/g' -e 's/ :/:/g' -e 's/\$$/#/g' > $@ +${ASMFILES_S} : %.s : %.cc + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} ${ASMFLAGS} $< | grep -v '^#' | grep -v '^ *#line' | sed -e 's/\([.%]\) /\1/g' -e 's/ , /,/g' -e 's/ :/:/g' -e 's/\$$/#/g' > $@ else ifeq (@host_cpu@,m68k) -$(ASMFILES_S) : %.s : %.cc +${ASMFILES_S} : %.s : %.cc ifeq (@AS_UNDERSCORE@,true) - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -P $(ASMFLAGS) $< | sed -e 's/\\#/#/g' -e 's/\$$//g' > $@ + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -P ${ASMFLAGS} $< | sed -e 's/\\#/#/g' -e 's/\$$//g' > $@ else - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -P $(ASMFLAGS) $< | sed -e 's/\\#/#/g' -e 's/\$$/%/g' > $@ + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -P ${ASMFLAGS} $< | sed -e 's/\\#/#/g' -e 's/\$$/%/g' > $@ endif else ifeq (@host_cpu@,hppa) -$(ASMFILES_S) : %.s : %.cc - -$(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -P $(ASMFLAGS) $< > $@ +${ASMFILES_S} : %.s : %.cc + -${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -P ${ASMFLAGS} $< > $@ else -$(ASMFILES_S) : %.s : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -P $(ASMFLAGS) $< > $@ +${ASMFILES_S} : %.s : %.cc + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -P ${ASMFLAGS} $< > $@ endif endif endif ifeq (@host_cpu@,hppa) # Only the native as groks the .SHORTDATA statements -$(ASMFILES_LO) : %.lo : %.s - $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(TARGET_ARCH) -c $< \ - || COMPILER_PATH=/usr/ccs/bin $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(TARGET_ARCH) -c $< \ - || COMPILER_PATH=/bin $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(TARGET_ARCH) -c $< +${ASMFILES_LO} : %.lo : %.s + ${LIBTOOL_COMPILE} ${CC} ${CFLAGS} ${TARGET_ARCH} -c $< \ + || COMPILER_PATH=/usr/ccs/bin ${LIBTOOL_COMPILE} ${CC} ${CFLAGS} ${TARGET_ARCH} -c $< \ + || COMPILER_PATH=/bin ${LIBTOOL_COMPILE} ${CC} ${CFLAGS} ${TARGET_ARCH} -c $< else -$(ASMFILES_LO) : %.lo : %.s - $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(ASMFLAGS) $(TARGET_ARCH) -c $< +${ASMFILES_LO} : %.lo : %.s + ${LIBTOOL_COMPILE} ${CC} ${CFLAGS} ${ASMFLAGS} ${TARGET_ARCH} -c $< endif endif # Recurse into subdirectories -$(SUBDIRS_TARGET) : %.target : %.dirdep - $(MAKE) SUBDIR=$* +${SUBDIRS_TARGET} : %.target : %.dirdep + ${MAKE} SUBDIR=$* -$(SUBDIRS_DIRDEP) : %.dirdep : +${SUBDIRS_DIRDEP} : %.dirdep : -ifeq ($(SUBDIR),.) +ifeq (${SUBDIR},.) -$(ALLOBJECTS_LO) : $(SUBDIRS_TARGET) +${ALLOBJECTS_LO} : ${SUBDIRS_TARGET} -libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO) - echo $(ALLOBJECTS_LO) | tr ' ' '\n' > libcln.objectlist - $(LIBTOOL_LINK) $(CXX) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) -objectlist libcln.objectlist +libcln.la : ${LIBTOOL} ${ALLOBJECTS_LO} + echo ${ALLOBJECTS_LO} | tr ' ' '\n' > libcln.objectlist + ${LIBTOOL_LINK} ${CXX} -o libcln.la -rpath ${libdir} -version-info ${CL_CURRENT}:${CL_REVISION}:${CL_AGE} ${LDFLAGS} ${LIBS} -objectlist libcln.objectlist install : all force - $(MKDIR) $(DESTDIR)$(libdir) - $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) libcln.la $(DESTDIR)$(libdir)/libcln.la - $(MKDIR) $(DESTDIR)$(includedir)/cln - $(INSTALL_DATA) $(top_srcdir)/include/cln/*.h $(DESTDIR)$(includedir)/cln - $(INSTALL_DATA) ../include/cln/*.h $(DESTDIR)$(includedir)/cln + ${MKDIR} ${DESTDIR}${libdir} + ${LIBTOOL_INSTALL} ${INSTALL_PROGRAM} libcln.la ${DESTDIR}${libdir}/libcln.la + ${MKDIR} ${DESTDIR}${includedir}/cln + ${INSTALL_DATA} ${top_srcdir}/include/cln/*.h ${DESTDIR}${includedir}/cln + ${INSTALL_DATA} ../include/cln/*.h ${DESTDIR}${includedir}/cln installdirs : force - $(MKDIR) $(DESTDIR)$(libdir) - $(MKDIR) $(DESTDIR)$(includedir)/cln + ${MKDIR} ${DESTDIR}${libdir} + ${MKDIR} ${DESTDIR}${includedir}/cln uninstall : force - $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libcln.la - $(RM) -r $(DESTDIR)$(includedir)/cln + ${LIBTOOL_UNINSTALL} ${RM} ${DESTDIR}${libdir}/libcln.la + ${RM} -r ${DESTDIR}${includedir}/cln check : all mostlyclean : clean clean : force - $(RM) *.s *.o *.lo *.a *.la *.objectlist core - $(RM) -r .libs _libs + ${RM} *.s *.o *.lo *.a *.la *.objectlist core + ${RM} -r .libs _libs distclean : clean - $(RM) config.status config.log config.cache Makefile + ${RM} config.status config.log config.cache Makefile maintainer-clean : distclean diff --git a/tests/Makefile.in b/tests/Makefile.in index dc6bf80..48551b8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -16,39 +16,40 @@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CXXCPP = @CXXCPP@ -INCLUDES = -I../include -I$(top_srcdir)/include -I$(srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/base -I$(top_srcdir)/src/float -I$(top_srcdir)/src/float/lfloat -I$(top_srcdir)/src/integer -I$(top_srcdir)/src/base/random -I$(top_srcdir)/src/base/digitseq -I$(top_srcdir)/src/base/digit -I../src/base -I$(top_srcdir)/src/base -override CPPFLAGS += $(INCLUDES) +INCLUDES = -I../include -I${top_srcdir}/include -I${srcdir} -I${top_srcdir}/src -I${top_srcdir}/src/base -I${top_srcdir}/src/float -I${top_srcdir}/src/float/lfloat -I${top_srcdir}/src/integer -I${top_srcdir}/src/base/random -I${top_srcdir}/src/base/digitseq -I${top_srcdir}/src/base/digit -I../src/base -I${top_srcdir}/src/base +override CPPFLAGS += ${INCLUDES} LIBTOOL = @LIBTOOL@ -LIBTOOL_LINK = $(LIBTOOL) --mode=link +LIBTOOL_LINK = ${LIBTOOL} --mode=link MV = mv LN = ln RM = rm -f @SET_MAKE@ +EXEEXT = @EXEEXT@ #### End of system configuration section. #### SHELL = /bin/sh -# Needed by $(LIBTOOL). +# Needed by ${LIBTOOL}. top_builddir = .. -VPATH = $(srcdir) +VPATH = {(srcdir} -FILES_CC := $(notdir $(wildcard $(srcdir)/*.cc)) -FILES_CC := $(filter-out %.i.cc, $(FILES_CC)) +FILES_CC := $(notdir $(wildcard ${srcdir}/*.cc)) +FILES_CC := $(filter-out %.i.cc, ${FILES_CC}) -FILES_I_CC := $(patsubst %.cc,%.i.cc,$(FILES_CC)) +FILES_I_CC := $(patsubst %.cc,%.i.cc,${FILES_CC}) -FILES_S := $(patsubst %.cc,%.s,$(FILES_CC)) +FILES_S := $(patsubst %.cc,%.s,${FILES_CC}) -FILES_O := $(patsubst %.cc,%.o,$(FILES_CC)) +FILES_O := $(patsubst %.cc,%.o,${FILES_CC}) -OBJECTS = $(FILES_O) +OBJECTS = ${FILES_O} LIBS = ../src/libcln.la -lm LIBDEPS = ../src/libcln.la -PROGRAMS = exam tests timemul timesquare timediv timesqrt timegcd timefact timeprint timeLFsqrt timeRAtoLF timeLFRAmul timeRALFdiv timepi timeexp1 timeeuler timecatalan timezeta3 timeLFln timeLFexp timeLFsin timeLFcos timeLFsinh timeLFcosh timeLFatan timeLFatanh timerecip2adic timediv2adic timeMIpow2recip timeMIpow2div timeMImisc5 timeUPMImul timesqrtmodp main +PROGRAMS = $(addsuffix ${EXEEXT},exam tests timemul timesquare timediv timesqrt timegcd timefact timeprint timeLFsqrt timeRAtoLF timeLFRAmul timeRALFdiv timepi timeexp1 timeeuler timecatalan timezeta3 timeLFln timeLFexp timeLFsin timeLFcos timeLFsinh timeLFcosh timeLFatan timeLFatanh timerecip2adic timediv2adic timeMIpow2recip timeMIpow2div timeMImisc5 timeUPMImul timesqrtmodp main) MODULES_exam = exam exam_I exam_RA exam_SF exam_FF exam_DF exam_LF exam_I_gcd exam_I_sqrtp MODULES_tests = tests \ test_I \ @@ -94,74 +95,74 @@ MODULES_timeUPMImul = timeUPMImul MODULES_timesqrtmodp = timesqrtmodp MODULES_main = main -all : exam tests +all : exam${EXEEXT} tests${EXEEXT} %.s : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ %.s : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -S $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@ ifdef notyet %.o : %.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ %.o : %.cc - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ + ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ else -$(FILES_O) : %.o : %.s - $(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@ +${FILES_O} : %.o : %.s + ${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -c $< -o $@ endif %.i : %.c - $(CPP) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CPP} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ %.i.cc : %.cc - $(CXXCPP) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) $< > $@ + ${CXXCPP} ${CXXFLAGS} ${CPPFLAGS} ${TARGET_ARCH} $< > $@ ../src/libcln.a : - cd ../src ; $(MAKE) libcln.a - -exam : $(patsubst %,%.o,$(MODULES_exam)) -tests : $(patsubst %,%.o,$(MODULES_tests)) -timemul : $(patsubst %,%.o,$(MODULES_timemul)) -timesquare : $(patsubst %,%.o,$(MODULES_timesquare)) -timediv : $(patsubst %,%.o,$(MODULES_timediv)) -timesqrt : $(patsubst %,%.o,$(MODULES_timesqrt)) -timegcd : $(patsubst %,%.o,$(MODULES_timegcd)) -timefact : $(patsubst %,%.o,$(MODULES_timefact)) -timeprint : $(patsubst %,%.o,$(MODULES_timeprint)) -timeLFsqrt : $(patsubst %,%.o,$(MODULES_timeLFsqrt)) -timeRAtoLF : $(patsubst %,%.o,$(MODULES_timeRAtoLF)) -timeLFRAmul : $(patsubst %,%.o,$(MODULES_timeLFRAmul)) -timeRALFdiv : $(patsubst %,%.o,$(MODULES_timeRALFdiv)) -timepi : $(patsubst %,%.o,$(MODULES_timepi)) -timeexp1 : $(patsubst %,%.o,$(MODULES_timeexp1)) -timeeuler : $(patsubst %,%.o,$(MODULES_timeeuler)) -timecatalan : $(patsubst %,%.o,$(MODULES_timecatalan)) -timezeta3 : $(patsubst %,%.o,$(MODULES_timezeta3)) -timeLFln : $(patsubst %,%.o,$(MODULES_timeLFln)) -timeLFexp : $(patsubst %,%.o,$(MODULES_timeLFexp)) -timeLFsin : $(patsubst %,%.o,$(MODULES_timeLFsin)) -timeLFcos : $(patsubst %,%.o,$(MODULES_timeLFcos)) -timeLFsinh : $(patsubst %,%.o,$(MODULES_timeLFsinh)) -timeLFcosh : $(patsubst %,%.o,$(MODULES_timeLFcosh)) -timeLFatan : $(patsubst %,%.o,$(MODULES_timeLFatan)) -timeLFatanh : $(patsubst %,%.o,$(MODULES_timeLFatanh)) -timerecip2adic : $(patsubst %,%.o,$(MODULES_timerecip2adic)) -timediv2adic : $(patsubst %,%.o,$(MODULES_timediv2adic)) -timeMIpow2recip : $(patsubst %,%.o,$(MODULES_timeMIpow2recip)) -timeMIpow2div : $(patsubst %,%.o,$(MODULES_timeMIpow2div)) -timeMImisc5 : $(patsubst %,%.o,$(MODULES_timeMImisc5)) -timeUPMImul : $(patsubst %,%.o,$(MODULES_timeUPMImul)) -timesqrtmodp : $(patsubst %,%.o,$(MODULES_timesqrtmodp)) -main : $(patsubst %,%.o,$(MODULES_main)) -$(PROGRAMS) : % : $(LIBDEPS) - $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) $(TARGET_ARCH) $(patsubst %,%.o,$(MODULES_$(*F))) $(LDFLAGS) $(LIBS) -o $@ + cd ../src ; ${MAKE} libcln.a + +exam${EXEEXT} : $(patsubst %,%.o,$(MODULES_exam)) +tests${EXEEXT} : $(patsubst %,%.o,$(MODULES_tests)) +timemul${EXEEXT} : $(patsubst %,%.o,$(MODULES_timemul)) +timesquare${EXEEXT} : $(patsubst %,%.o,$(MODULES_timesquare)) +timediv${EXEEXT} : $(patsubst %,%.o,$(MODULES_timediv)) +timesqrt${EXEEXT} : $(patsubst %,%.o,$(MODULES_timesqrt)) +timegcd${EXEEXT} : $(patsubst %,%.o,$(MODULES_timegcd)) +timefact${EXEEXT} : $(patsubst %,%.o,$(MODULES_timefact)) +timeprint${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeprint)) +timeLFsqrt${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFsqrt)) +timeRAtoLF${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeRAtoLF)) +timeLFRAmul${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFRAmul)) +timeRALFdiv${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeRALFdiv)) +timepi${EXEEXT} : $(patsubst %,%.o,$(MODULES_timepi)) +timeexp1${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeexp1)) +timeeuler${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeeuler)) +timecatalan${EXEEXT} : $(patsubst %,%.o,$(MODULES_timecatalan)) +timezeta3${EXEEXT} : $(patsubst %,%.o,$(MODULES_timezeta3)) +timeLFln${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFln)) +timeLFexp${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFexp)) +timeLFsin${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFsin)) +timeLFcos${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFcos)) +timeLFsinh${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFsinh)) +timeLFcosh${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFcosh)) +timeLFatan${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFatan)) +timeLFatanh${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeLFatanh)) +timerecip2adic${EXEEXT} : $(patsubst %,%.o,$(MODULES_timerecip2adic)) +timediv2adic${EXEEXT} : $(patsubst %,%.o,$(MODULES_timediv2adic)) +timeMIpow2recip${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeMIpow2recip)) +timeMIpow2div${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeMIpow2div)) +timeMImisc5${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeMImisc5)) +timeUPMImul${EXEEXT} : $(patsubst %,%.o,$(MODULES_timeUPMImul)) +timesqrtmodp${EXEEXT} : $(patsubst %,%.o,$(MODULES_timesqrtmodp)) +main${EXEEXT} : $(patsubst %,%.o,$(MODULES_main)) +${PROGRAMS} : %${EXEEXT} : ${LIBDEPS} + ${LIBTOOL_LINK} ${CXX} ${CXXFLAGS} ${TARGET_ARCH} $(patsubst %,%.o,$(MODULES_$(*F))) ${LDFLAGS} ${LIBS} -o $@ install : all @@ -171,17 +172,17 @@ installdirs : uninstall : check : all - ./exam - ./tests + ./exam${EXEEXT} + ./tests${EXEEXT} mostlyclean : clean clean : force - $(RM) *.s *.o *.a exam tests main a.out core - $(RM) -r .libs _libs + ${RM} *.s *.o *.a exam tests main a.out core + ${RM} -r .libs _libs distclean : clean - $(RM) config.status config.log config.cache Makefile + ${RM} config.status config.log config.cache Makefile maintainer-clean : distclean