Skip to content
GitLab
Commit fa28463e authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

Fixed icc 11 compilations options on x86-64 architecture. 

Cleaned up obsolete references.
Added favicon to XSLT filter.
parent 222685bf
Show whitespace changes
Inline Side-by-side
acx_prog_cc_optim.m4
View file @ fa28463e
...@@ -8,7 +8,7 @@ dnl IRIX C compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90 ...@@ -8,7 +8,7 @@ dnl IRIX C compiler, NEC SX-5 (Super-UX 10) C compiler, and Cray J90
dnl (Unicos 10.0.0.8) C compiler. dnl (Unicos 10.0.0.8) C compiler.
dnl dnl
dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS dnl This macro is a modification of Ville Laurikari's VL_PROG_CC_WARNINGS
dnl @version 1.3 (2009-03-23) dnl @version 1.3 (2009-04-01)
dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi> dnl @authors Emmanuel Bertin <bertin@iap.fr> Ville Laurikari <vl@iki.fi>
dnl dnl
AC_DEFUN([ACX_PROG_CC_OPTIM], [ AC_DEFUN([ACX_PROG_CC_OPTIM], [
...@@ -32,7 +32,7 @@ EOF ...@@ -32,7 +32,7 @@ EOF
if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 && if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&
$CC -c -O conftest.c > /dev/null 2>&1 && $CC -c -O conftest.c > /dev/null 2>&1 &&
test -f conftest.o; then test -f conftest.o; then
prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll" prog_cc_optim_flags="-O3 -axSSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"
prog_ld_optim_flags="-static-intel" prog_ld_optim_flags="-static-intel"
dnl INTEL C 32bits compiler dnl INTEL C 32bits compiler
......
configure
View file @ fa28463e
...@@ -4298,7 +4298,7 @@ EOF ...@@ -4298,7 +4298,7 @@ EOF
if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 && if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&
$CC -c -O conftest.c > /dev/null 2>&1 && $CC -c -O conftest.c > /dev/null 2>&1 &&
test -f conftest.o; then test -f conftest.o; then
prog_cc_optim_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll" prog_cc_optim_flags="-O3 -axSSE3,SSE4.1,SSE4.2 -ip -no-prec-div -unroll"
prog_ld_optim_flags="-static-intel" prog_ld_optim_flags="-static-intel"
   
elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 && elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&
......
sextractor-tpx.spec.in deleted 100644 → 0
View file @ 222685bf
%define name @PACKAGE_NAME@
%define version @PACKAGE_VERSION@
%define release 1tpx
Summary: Extract catalogs of sources from astronomical images
Name: %{name}
Version: %{version}
Release: %{release}
Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz
URL: http://terapix.iap.fr/soft/%{name}
License: LGPL
Group: Sciences/Astronomy
BuildRoot: %{_tmppath}/%{name}-buildroot
Prefix: %{_prefix}
%description
SExtractor stands for ``Source Extractor'': a software for making catalog of sources from astronomical images.
%prep
%setup -q
%build
./configure --prefix=$RPM_BUILD_ROOT/usr/local/ --mandir=$RPM_BUILD_ROOT/usr/local/man/ --with-xsl_url=file:///usr/local/share/@PACKAGE_NAME@/sextractor.xsl --enable-static
make
%install
make install
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/local/bin/sex
/usr/local/man/man1/sex.1
/usr/local/man/manx/sex.x
/usr/local/share/@PACKAGE_NAME@
%doc AUTHORS BUGS ChangeLog COPYING HISTORY INSTALL README THANKS doc/README.DOC doc/sextractor.ps
%changelog
* @DATE2@ @PACKAGER@ <@PACKAGE_BUGREPORT@>
- Automatic RPM rebuild
* Tue May 13 2003 Emmanuel Bertin <bertin@iap.fr>
- RPM build for V2.3
* Fri Apr 04 2003 Emmanuel Bertin <bertin@iap.fr>
- RPM build for V2.3b4
* Wed Mar 05 2003 Emmanuel Bertin <bertin@iap.fr>
- RPM build for V2.3b3
* Fri Feb 07 2003 Emmanuel Bertin <bertin@iap.fr>
- Second RPM build
* Fri Jan 24 2003 Emmanuel Bertin <bertin@iap.fr>
- Second RPM build
* Sun Dec 15 2002 Emmanuel Bertin <bertin@iap.fr>
- First RPM build
# end of file
sextractor.spec.in
View file @ fa28463e
...@@ -8,7 +8,7 @@ Name: %{name} ...@@ -8,7 +8,7 @@ Name: %{name}
Version: %{version} Version: %{version}
Release: %{release} Release: %{release}
Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz Source0: ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/%{name}-%{version}.tar.gz
URL: http://terapix.iap.fr/soft/%{name} URL: http://astromatic.iap.fr/software/%{name}
License: CeCILL License: CeCILL
Group: Sciences/Astronomy Group: Sciences/Astronomy
BuildRoot: %{_tmppath}/%{name}-buildroot BuildRoot: %{_tmppath}/%{name}-buildroot
......
src/ldactoasc.h
View file @ fa28463e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: global definitions. * Contents: global definitions.
* *
* Last modify: 04/06/2007 * Last modify: 01/04/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#define MYVERSION VERSION #define MYVERSION VERSION
#endif #endif
#define COPYRIGHT "Emmanuel BERTIN <bertin@iap.fr>" #define COPYRIGHT "Emmanuel BERTIN <bertin@iap.fr>"
#define WEBSITE "http://terapix.iap.fr/soft/sextractor/" #define WEBSITE "http://astromatic.iap.fr/software/sextractor/"
#define INSTITUTE "TERAPIX team at IAP http://terapix.iap.fr" #define INSTITUTE "IAP http://www.iap.fr"
/*----------------------------- Physical constants --------------------------*/ /*----------------------------- Physical constants --------------------------*/
......
src/xml.h
View file @ fa28463e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* Contents: XML logging. * Contents: XML logging.
* *
* Last modify: 19/12/2007 * Last modify: 01/04/2009
* *
*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/ */
...@@ -23,17 +23,10 @@ ...@@ -23,17 +23,10 @@
#endif #endif
/*----------------------------- Internal constants --------------------------*/ /*----------------------------- Internal constants --------------------------*/
/*
#define XSL_URL "file:///home/bertin/sources/sex/xsl/sex.xsl"
*/
#ifndef XSL_URL #ifndef XSL_URL
#define XSL_URL "." #define XSL_URL "."
#endif #endif
/* Alternate XSLT file at TERAPIX: */
/* will not work with recent browsers because of security limitations */
/*
#define XSL_URL_ALT "http://terapix.iap.fr/cplt/xsl/sex.xsl"
*/
/*--------------------------------- typedefs --------------------------------*/ /*--------------------------------- typedefs --------------------------------*/
typedef struct typedef struct
{ {
......
xsl/sextractor.xsl
View file @ fa28463e
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<xsl:variable name="time" select="/VOTABLE/RESOURCE/RESOURCE[@name='MetaData']/PARAM[@name='Time']/@value"/> <xsl:variable name="time" select="/VOTABLE/RESOURCE/RESOURCE[@name='MetaData']/PARAM[@name='Time']/@value"/>
<HTML> <HTML>
<HEAD> <HEAD>
<!-- <script type="text/javascript" language="javascript"> --> <link rel="shortcut icon" type="image/x-icon" href="http://astromatic.iap.fr/xsl/favicon.ico" />
<script src="http://astromatic.iap.fr/xsl/sorttable.js"/> <script type="text/javascript" src="http://astromatic.iap.fr/xsl/sorttable.js"/>
<style type="text/css"> <style type="text/css">
p { p {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment