LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Few minor script and flag changes

Browse Source
This commit is contained in:
Bastian M. Wojek 2009-06-20 05:50:09 +00:00
parent 52ae98ef9c
commit 117ccbf38a
6 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -1,7 +1,7 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# INSTALL # INSTALL
# Andreas Suter, 2008/01/15 # Andreas Suter, 2008/01/15
# $Id: README 3854 2009-04-14 19:32:35Z nemu $ # $Id: INSTALL 3854 2009-04-14 19:32:35Z nemu $
#--------------------------------------------------------------------- #---------------------------------------------------------------------
To get it all build: To get it all build:

28
autogen.sh
View File

@ -1,10 +1,10 @@
#! /bin/sh #! /bin/sh
# $Id: autogen.sh,v 1.4 2002/12/02 01:39:49 murrayc Exp $ # autogen.sh
# #
# Copyright (c) 2009 BMW # Copyright (c) 2009 BMW
# #
# Based on a autogen.sh script written by Daniel Elstner <daniel.elstner@gmx.net> # Based on an autogen.sh script written by Daniel Elstner <daniel.elstner@gmx.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License VERSION 2 as # it under the terms of the GNU General Public License VERSION 2 as
@ -27,22 +27,32 @@ test "x${dir}" = "x" && dir='.'
if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`" if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
then then
echo "This script must be executed directly from the source directory." echo "This script must be executed directly from the source directory!"
exit 1 exit 1
fi fi
rm -f config.cache acconfig.h rm -f config.cache
echo "--> libtoolize" && \ if test -e admin/depcomp && \
test -e admin/install-sh && \
test -e admin/ltmain.sh && \
test -e admin/missing && \
test -e aclocal.m4
then
echo ">> autoreconf" && \
autoreconf && exit 0
else
echo ">> libtoolize" && \
libtoolize --force && \ libtoolize --force && \
echo "--> aclocal" && \ echo ">> aclocal" && \
aclocal && \ aclocal && \
echo "--> autoconf" && \ echo ">> autoconf" && \
autoconf && \ autoconf && \
echo "--> autoheader" && \ echo ">> autoheader" && \
autoheader && \ autoheader && \
echo "--> automake" && \ echo ">> automake" && \
automake --add-missing --gnu && exit 0 automake --add-missing --gnu && exit 0
fi
exit 1 exit 1

21
configure.ac
View File

@ -85,8 +85,8 @@ dnl Ask user for path to fftw3 stuff
dnl ----------------------------------------------- dnl -----------------------------------------------
FFTW3_FOUND=0 FFTW3_FOUND=0
AC_ARG_WITH(fftw3, AC_ARG_WITH([fftw3],
[ --with-fftw3=<path> prefix of FFTW3 installation. e.g. /usr/local or /usr], [AC_HELP_STRING([--with-fftw3],[prefix of FFTW3 installation. e.g. /usr/local or /usr])],
[FFTW3_PREFIX=$with_fftw3 [FFTW3_PREFIX=$with_fftw3
if !(test -r ${FFTW3_PREFIX}/include/fftw3.h); then if !(test -r ${FFTW3_PREFIX}/include/fftw3.h); then
AC_MSG_ERROR(FFTW3 cannot be found at the specified path!) AC_MSG_ERROR(FFTW3 cannot be found at the specified path!)
@ -96,7 +96,7 @@ AC_ARG_WITH(fftw3,
[if test -r /usr/local/include/fftw3.h; then [if test -r /usr/local/include/fftw3.h; then
FFTW3_PREFIX="/usr/local" FFTW3_PREFIX="/usr/local"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)]) AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)])
else if test -r /usr/include/fftw3.h; then elif test -r /usr/include/fftw3.h; then
FFTW3_PREFIX="/usr" FFTW3_PREFIX="/usr"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)]) AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the no just above)])
else else
@ -106,7 +106,6 @@ AC_ARG_WITH(fftw3,
e.g. --with-fftw3=/usr/local or --with-fftw3=/usr] e.g. --with-fftw3=/usr/local or --with-fftw3=/usr]
) )
fi fi
fi
] ]
) )
] ]
@ -125,8 +124,8 @@ dnl Ask user for path to gsl stuff
dnl ----------------------------------------------- dnl -----------------------------------------------
GSL_FOUND=0 GSL_FOUND=0
AC_ARG_WITH(gsl, AC_ARG_WITH([gsl],
[ --with-gsl=<path> prefix of GSL installation. e.g. /usr/local or /usr], [AC_HELP_STRING([--with-gsl],[prefix of GSL installation. e.g. /usr/local or /usr])],
[GSL_PREFIX=$with_gsl [GSL_PREFIX=$with_gsl
if !(test -r ${GSL_PREFIX}/include/gsl/gsl_sf_hyperg.h); then if !(test -r ${GSL_PREFIX}/include/gsl/gsl_sf_hyperg.h); then
AC_MSG_ERROR(GSL cannot be found at the specified path!) AC_MSG_ERROR(GSL cannot be found at the specified path!)
@ -136,7 +135,7 @@ AC_ARG_WITH(gsl,
[if test -r /usr/local/include/gsl/gsl_sf_hyperg.h; then [if test -r /usr/local/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/usr/local" GSL_PREFIX="/usr/local"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)]) AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)])
else if test -r /usr/include/gsl/gsl_sf_hyperg.h; then elif test -r /usr/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/usr" GSL_PREFIX="/usr"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)]) AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the no just above)])
else else
@ -146,7 +145,6 @@ AC_ARG_WITH(gsl,
e.g. --with-gsl=/usr/local or --with-gsl=/usr] e.g. --with-gsl=/usr/local or --with-gsl=/usr]
) )
fi fi
fi
] ]
) )
] ]
@ -165,8 +163,8 @@ dnl Ask user for path to boost stuff
dnl ----------------------------------------------- dnl -----------------------------------------------
BOOST_FOUND=0 BOOST_FOUND=0
AC_ARG_WITH(boostinc, AC_ARG_WITH([boostinc],
[ --with-boostinc=<path> path to the header files of the Boost installation. e.g. /usr/local/include or /usr/include], [AC_HELP_STRING([--with-boostinc],[path to the header files of the Boost installation, e.g. /usr/local/include or /usr/include])],
[BOOST_INCLUDE=$with_boostinc [BOOST_INCLUDE=$with_boostinc
if !(test -r ${BOOST_INCLUDE}/boost/spirit.hpp); then if !(test -r ${BOOST_INCLUDE}/boost/spirit.hpp); then
AC_MSG_ERROR(Boost cannot be found at the specified path!) AC_MSG_ERROR(Boost cannot be found at the specified path!)
@ -176,7 +174,7 @@ AC_ARG_WITH(boostinc,
[if test -r /usr/local/include/boost/spirit.hpp; then [if test -r /usr/local/include/boost/spirit.hpp; then
BOOST_INCLUDE="/usr/local/include" BOOST_INCLUDE="/usr/local/include"
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)]) AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)])
else if test -r /usr/include/boost/spirit.hpp; then elif test -r /usr/include/boost/spirit.hpp; then
BOOST_INCLUDE="/usr/include" BOOST_INCLUDE="/usr/include"
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)]) AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the no just above)])
else else
@ -186,7 +184,6 @@ AC_ARG_WITH(boostinc,
e.g. --with-boostinc=/usr/local/include or --with-boostinc=/usr/include or --with-boostinc=/usr/include/boost-1_33_0] e.g. --with-boostinc=/usr/local/include or --with-boostinc=/usr/include or --with-boostinc=/usr/include/boost-1_33_0]
) )
fi fi
fi
] ]
) )
] ]

2
src/Makefile.am
View File

@ -14,7 +14,7 @@ xml_DATA = musrfit_startup.xml
LIBADD = $(LEM_LIBS) $(PMUSR_LIBS) LIBADD = $(LEM_LIBS) $(PMUSR_LIBS)
AM_CFLAGS = -g -O3 -Wall -Wno-trigraphs AM_CXXFLAGS = -Wall -Wno-trigraphs
INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS) INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
LIBS = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) LIBS = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)

6
src/classes/Makefile.am
View File

@ -64,10 +64,10 @@ ext_source_dir = $(top_srcdir)/src/external/MuSR_software/Class_MuSR_PSI
ext_h_sources = $(ext_source_dir)/MuSR_td_PSI_bin.h $(ext_source_dir)/tydefs.h ext_h_sources = $(ext_source_dir)/MuSR_td_PSI_bin.h $(ext_source_dir)/tydefs.h
ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp
include_HEADERS = $(h_sources) $(ext_h_sources) include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h
INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS) INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
AM_CXXFLAGS = -g -O3 -Wall -Wno-trigraphs AM_CXXFLAGS = -Wall -Wno-trigraphs
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_CPPFLAGS = -I@ROOTINCDIR@ AM_CPPFLAGS = -I@ROOTINCDIR@

1
src/external/TLemRunHeader/Makefile.am vendored
View File

@ -23,6 +23,7 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources) include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
INCLUDES = -I. $(ROOT_CFLAGS) INCLUDES = -I. $(ROOT_CFLAGS)
AM_CXXFLAGS = -Wall -Wno-trigraphs
BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources) BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources)
AM_CPPFLAGS = -I@ROOTINCDIR@ AM_CPPFLAGS = -I@ROOTINCDIR@