Loading ChangeLog +1 −58 Original line number Diff line number Diff line Loading @@ -9,68 +9,11 @@ * * Contents: log of changes made to the SExtractor source * * Last modify: 17/01/2007 * Last modify: 14/07/2006 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ ------------------------------------------------------------------------ r380 | bertin | 2007-01-17 17:52:49 +0100 (Wed, 17 Jan 2007) | 3 lines Added options for compiling with icc (Intel compiler). Pushed version number to 2.5.1. ------------------------------------------------------------------------ r365 | bertin | 2006-11-09 18:39:27 +0100 (Thu, 09 Nov 2006) | 2 lines Undo previous changes (wrong repository!!). ------------------------------------------------------------------------ r364 | bertin | 2006-11-09 17:58:18 +0100 (Thu, 09 Nov 2006) | 2 lines Added lmfit routines by Joachim Wuttke in the form of a library. ------------------------------------------------------------------------ r358 | bertin | 2006-10-29 21:04:25 +0100 (Sun, 29 Oct 2006) | 5 lines Updated FITS library to the latest version. Fixed some UCDs in output parameters. Applied patch by Sergio Pascual for configuring the path to the XSL file. Updated the BUGS section. ------------------------------------------------------------------------ r327 | bertin | 2006-08-16 18:06:49 +0200 (Wed, 16 Aug 2006) | 2 lines Discard NaN pixels in non-weighted background measurements (as in SWarp). ------------------------------------------------------------------------ r305 | baillard | 2006-07-19 15:28:15 +0200 (Wed, 19 Jul 2006) | 2 lines Change name ------------------------------------------------------------------------ r303 | baillard | 2006-07-19 15:05:48 +0200 (Wed, 19 Jul 2006) | 2 lines Change names ------------------------------------------------------------------------ r295 | baillard | 2006-07-18 13:54:43 +0200 (Tue, 18 Jul 2006) | 2 lines Move sextractor to public repository ------------------------------------------------------------------------ r290 | bertin | 2006-07-17 19:56:12 +0200 (Mon, 17 Jul 2006) | 4 lines Doc: keyword list updated. ChangeLog updated. Back-propagated destructive byte-swapping bugfix in FITS library. ------------------------------------------------------------------------ r289 | bertin | 2006-07-14 20:25:09 +0200 (Fri, 14 Jul 2006) | 3 lines Removed warnings in psf.c (P.Delorme's edits) using brute-force. Switched ChangeLog to SVN format. ------------------------------------------------------------------------ r288 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines Loading Makefile.am +5 −20 Original line number Diff line number Diff line # Main Makefile for SExtractor # Copyright (C) 2002-2007 Emmanuel Bertin. # Copyright (C) 2002-2005 Emmanuel Bertin. AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src dist_pkgdata_DATA = xsl/sextractor.xsl EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYING HISTORY \ INSTALL README THANKS \ acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4 RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir` acx_prog_cc_optim.m4 RPM_ROOTDIR = /usr/src/RPM RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES rpm: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) Loading @@ -14,29 +13,15 @@ rpm: dist rpm-opteron: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ -march=opteron" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ -march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec rpm-opteron-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec icc: $(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm" athlon: $(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm" Loading Makefile.in +41 −78 Original line number Diff line number Diff line # Makefile.in generated by automake 1.9.4 from Makefile.am. # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # 2003, 2004 Free Software Foundation, Inc. # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. Loading @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ Loading @@ -35,18 +34,15 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(srcdir)/sextractor-tpx.spec.in \ $(srcdir)/sextractor.spec.in $(top_srcdir)/configure AUTHORS \ COPYING ChangeLog INSTALL THANKS autoconf/config.guess \ autoconf/config.sub autoconf/depcomp autoconf/install-sh \ autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/sextractor-tpx.spec.in $(srcdir)/sextractor.spec.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ THANKS autoconf/config.guess autoconf/config.sub \ autoconf/depcomp autoconf/install-sh autoconf/ltmain.sh \ autoconf/missing autoconf/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \ $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/acx_urbi_resolve_dir.m4 \ am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) Loading @@ -65,15 +61,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgdatadir)" dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_pkgdata_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) Loading Loading @@ -166,15 +153,14 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main Makefile for SExtractor # Copyright (C) 2002-2007 Emmanuel Bertin. # Copyright (C) 2002-2005 Emmanuel Bertin. AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src dist_pkgdata_DATA = xsl/sextractor.xsl EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYING HISTORY \ INSTALL README THANKS \ acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4 acx_prog_cc_optim.m4 RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir` RPM_ROOTDIR = /usr/src/RPM RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Loading Loading @@ -235,23 +221,6 @@ sextractor.spec: $(top_builddir)/config.status $(srcdir)/sextractor.spec.in sextractor-tpx.spec: $(top_builddir)/config.status $(srcdir)/sextractor-tpx.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. Loading @@ -260,7 +229,13 @@ uninstall-dist_pkgdataDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *k*) failcom='fail=yes';; \ esac; \ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ Loading @@ -272,7 +247,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ Loading @@ -280,7 +255,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *k*) failcom='fail=yes';; \ esac; \ done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ Loading @@ -301,7 +282,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ Loading Loading @@ -376,7 +357,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man $(distdir)/xsl $(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ Loading Loading @@ -517,12 +498,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(DATA) config.h all-am: Makefile config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive Loading Loading @@ -566,7 +544,7 @@ info: info-recursive info-am: install-data-am: install-dist_pkgdataDATA install-data-am: install-exec-am: Loading Loading @@ -594,7 +572,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive Loading @@ -605,13 +583,12 @@ uninstall-info: uninstall-info-recursive distclean-hdr distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dist_pkgdataDATA install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-dist_pkgdataDATA \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-info-am rpm: dist Loading @@ -620,29 +597,15 @@ rpm: dist rpm-opteron: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ -march=opteron" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ -march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec rpm-opteron-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec icc: $(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm" athlon: $(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm" Loading aclocal.m4 +121 −316 File changed.Preview size limit exceeded, changes collapsed. Show changes acx_urbi_resolve_dir.m4deleted 100644 → 0 +0 −48 Original line number Diff line number Diff line # URBI_RESOLVE_DIR_PREPARE # ------------------------ # Define urbi_resolve_dir. m4_defun([URBI_RESOLVE_DIR_PREPARE], [# PATH urbi_resolve_dir(DIR) # -------------------------- # Return the DIR with all inner variables expanded. urbi_resolve_dir () { ac_$0_dir=$[]1 ac_$0_res= ac_$0_prefix_NONE= ac_$0_exec_prefix_NONE= test "x$prefix" = xNONE && ac_$0_exec_prefix_NONE=yes && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && ac_$0_exec_prefix_NONE=yes && exec_prefix=$prefix while true do eval ac_$0_res="$ac_$0_dir" if test x"$ac_$0_dir" == x"$ac_$0_res"; then break fi ac_$0_dir=$ac_$0_res done test "$ac_$0_prefix_NONE" && prefix=NONE test "$ac_$0_exec_prefix_NONE" && exec_prefix=NONE echo "$ac_$0_res" } ]) # PATH URBI_RESOLVE_DIR(DIR) # -------------------------- # Return the DIR with all inner variables expanded. AC_DEFUN([URBI_RESOLVE_DIR], [AC_REQUIRE([URBI_RESOLVE_DIR_PREPARE])dnl urbi_resolve_dir '$1'[]dnl ]) ## Local Variables: ## mode: autoconf ## End: Loading
ChangeLog +1 −58 Original line number Diff line number Diff line Loading @@ -9,68 +9,11 @@ * * Contents: log of changes made to the SExtractor source * * Last modify: 17/01/2007 * Last modify: 14/07/2006 * *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ ------------------------------------------------------------------------ r380 | bertin | 2007-01-17 17:52:49 +0100 (Wed, 17 Jan 2007) | 3 lines Added options for compiling with icc (Intel compiler). Pushed version number to 2.5.1. ------------------------------------------------------------------------ r365 | bertin | 2006-11-09 18:39:27 +0100 (Thu, 09 Nov 2006) | 2 lines Undo previous changes (wrong repository!!). ------------------------------------------------------------------------ r364 | bertin | 2006-11-09 17:58:18 +0100 (Thu, 09 Nov 2006) | 2 lines Added lmfit routines by Joachim Wuttke in the form of a library. ------------------------------------------------------------------------ r358 | bertin | 2006-10-29 21:04:25 +0100 (Sun, 29 Oct 2006) | 5 lines Updated FITS library to the latest version. Fixed some UCDs in output parameters. Applied patch by Sergio Pascual for configuring the path to the XSL file. Updated the BUGS section. ------------------------------------------------------------------------ r327 | bertin | 2006-08-16 18:06:49 +0200 (Wed, 16 Aug 2006) | 2 lines Discard NaN pixels in non-weighted background measurements (as in SWarp). ------------------------------------------------------------------------ r305 | baillard | 2006-07-19 15:28:15 +0200 (Wed, 19 Jul 2006) | 2 lines Change name ------------------------------------------------------------------------ r303 | baillard | 2006-07-19 15:05:48 +0200 (Wed, 19 Jul 2006) | 2 lines Change names ------------------------------------------------------------------------ r295 | baillard | 2006-07-18 13:54:43 +0200 (Tue, 18 Jul 2006) | 2 lines Move sextractor to public repository ------------------------------------------------------------------------ r290 | bertin | 2006-07-17 19:56:12 +0200 (Mon, 17 Jul 2006) | 4 lines Doc: keyword list updated. ChangeLog updated. Back-propagated destructive byte-swapping bugfix in FITS library. ------------------------------------------------------------------------ r289 | bertin | 2006-07-14 20:25:09 +0200 (Fri, 14 Jul 2006) | 3 lines Removed warnings in psf.c (P.Delorme's edits) using brute-force. Switched ChangeLog to SVN format. ------------------------------------------------------------------------ r288 | bertin | 2006-07-14 20:13:39 +0200 (Fri, 14 Jul 2006) | 8 lines Loading
Makefile.am +5 −20 Original line number Diff line number Diff line # Main Makefile for SExtractor # Copyright (C) 2002-2007 Emmanuel Bertin. # Copyright (C) 2002-2005 Emmanuel Bertin. AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src dist_pkgdata_DATA = xsl/sextractor.xsl EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYING HISTORY \ INSTALL README THANKS \ acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4 RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir` acx_prog_cc_optim.m4 RPM_ROOTDIR = /usr/src/RPM RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES rpm: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) Loading @@ -14,29 +13,15 @@ rpm: dist rpm-opteron: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ -march=opteron" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ -march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec rpm-opteron-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec icc: $(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm" athlon: $(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm" Loading
Makefile.in +41 −78 Original line number Diff line number Diff line # Makefile.in generated by automake 1.9.4 from Makefile.am. # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, # 2003, 2004 Free Software Foundation, Inc. # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. Loading @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ Loading @@ -35,18 +34,15 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(dist_pkgdata_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(srcdir)/sextractor-tpx.spec.in \ $(srcdir)/sextractor.spec.in $(top_srcdir)/configure AUTHORS \ COPYING ChangeLog INSTALL THANKS autoconf/config.guess \ autoconf/config.sub autoconf/depcomp autoconf/install-sh \ autoconf/ltmain.sh autoconf/missing autoconf/mkinstalldirs DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/sextractor-tpx.spec.in $(srcdir)/sextractor.spec.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ THANKS autoconf/config.guess autoconf/config.sub \ autoconf/depcomp autoconf/install-sh autoconf/ltmain.sh \ autoconf/missing autoconf/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acx_urbi_resolve_dir.m4 \ $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/acx_urbi_resolve_dir.m4 \ am__aclocal_m4_deps = $(top_srcdir)/acx_prog_cc_optim.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) Loading @@ -65,15 +61,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-recursive installcheck-recursive installdirs-recursive \ pdf-recursive ps-recursive uninstall-info-recursive \ uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgdatadir)" dist_pkgdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_pkgdata_DATA) ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) Loading Loading @@ -166,15 +153,14 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main Makefile for SExtractor # Copyright (C) 2002-2007 Emmanuel Bertin. # Copyright (C) 2002-2005 Emmanuel Bertin. AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src dist_pkgdata_DATA = xsl/sextractor.xsl EXTRA_DIST = config doc AUTHORS BUGS ChangeLog COPYING HISTORY \ INSTALL README THANKS \ acx_prog_cc_optim.m4 acx_urbi_resolve_dir.m4 acx_prog_cc_optim.m4 RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir` RPM_ROOTDIR = /usr/src/RPM RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive Loading Loading @@ -235,23 +221,6 @@ sextractor.spec: $(top_builddir)/config.status $(srcdir)/sextractor.spec.in sextractor-tpx.spec: $(top_builddir)/config.status $(srcdir)/sextractor-tpx.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: install-dist_pkgdataDATA: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done uninstall-dist_pkgdataDATA: @$(NORMAL_UNINSTALL) @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. Loading @@ -260,7 +229,13 @@ uninstall-dist_pkgdataDATA: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *k*) failcom='fail=yes';; \ esac; \ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ Loading @@ -272,7 +247,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ Loading @@ -280,7 +255,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $$MAKEFLAGS; amf=$$2; \ @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ *k*) failcom='fail=yes';; \ esac; \ done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ Loading @@ -301,7 +282,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ Loading Loading @@ -376,7 +357,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) $(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man $(distdir)/xsl $(mkdir_p) $(distdir)/. $(distdir)/autoconf $(distdir)/man @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ Loading Loading @@ -517,12 +498,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(DATA) config.h all-am: Makefile config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive Loading Loading @@ -566,7 +544,7 @@ info: info-recursive info-am: install-data-am: install-dist_pkgdataDATA install-data-am: install-exec-am: Loading Loading @@ -594,7 +572,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-dist_pkgdataDATA uninstall-info-am uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive Loading @@ -605,13 +583,12 @@ uninstall-info: uninstall-info-recursive distclean-hdr distclean-recursive distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dist_pkgdataDATA install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-dist_pkgdataDATA \ install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-info-am rpm: dist Loading @@ -620,29 +597,15 @@ rpm: dist rpm-opteron: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall \ -march=opteron" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="gcc" TPXFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ GCCFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 \ -march=i686 -msse -mfpmath=sse -mtune=athlon" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec rpm-opteron-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc" TPXFLAGS="-O3 -g -axWP -ip -unroll" rpmbuild -ba --target=x86_64 \ --clean $(PACKAGE_NAME).spec rpm-athlon-icc: dist cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR) TPXCC="icc32" TPXFLAGS="-O3 -g -axKWNPB -ip -unroll" rpmbuild \ -ba --target=i686 --clean $(PACKAGE_NAME).spec icc: $(MAKE) CC="icc" CFLAGS="-O3 -g -axWP -ip -unroll" LIBS="-lm" athlon: $(MAKE) CFLAGS="-O -g -funroll-loops -fomit-frame-pointer -Wall -m32 -march=i686 -msse -mfpmath=sse -mtune=athlon" LIBS="-lm" Loading
acx_urbi_resolve_dir.m4deleted 100644 → 0 +0 −48 Original line number Diff line number Diff line # URBI_RESOLVE_DIR_PREPARE # ------------------------ # Define urbi_resolve_dir. m4_defun([URBI_RESOLVE_DIR_PREPARE], [# PATH urbi_resolve_dir(DIR) # -------------------------- # Return the DIR with all inner variables expanded. urbi_resolve_dir () { ac_$0_dir=$[]1 ac_$0_res= ac_$0_prefix_NONE= ac_$0_exec_prefix_NONE= test "x$prefix" = xNONE && ac_$0_exec_prefix_NONE=yes && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && ac_$0_exec_prefix_NONE=yes && exec_prefix=$prefix while true do eval ac_$0_res="$ac_$0_dir" if test x"$ac_$0_dir" == x"$ac_$0_res"; then break fi ac_$0_dir=$ac_$0_res done test "$ac_$0_prefix_NONE" && prefix=NONE test "$ac_$0_exec_prefix_NONE" && exec_prefix=NONE echo "$ac_$0_res" } ]) # PATH URBI_RESOLVE_DIR(DIR) # -------------------------- # Return the DIR with all inner variables expanded. AC_DEFUN([URBI_RESOLVE_DIR], [AC_REQUIRE([URBI_RESOLVE_DIR_PREPARE])dnl urbi_resolve_dir '$1'[]dnl ]) ## Local Variables: ## mode: autoconf ## End:
