Commit 14750cee authored by Ralf Müller's avatar Ralf Müller
Browse files

Change to build static version only, if --enable-all-static is set; refs #602

parent 1608ae3b
......@@ -4,7 +4,7 @@
Name: cdo
#BuildRequires:
Version: 1.4.6
Version: 1.4.7rc4
Release: 1
Summary: Climate Data Operators
License: GNU GENERAL PUBLIC LICENSE Version 2, June 1991
......
......@@ -99,7 +99,8 @@ case "${HOSTNAME}" in
--with-zlib=/sw/etch-ia32/zlib-1.2.3 \
--with-szlib=/sw/etch-ia32/szip-2.1 \
--with-proj=/sw/etch-ia32/proj-4.6.0 \
CC=gcc CFLAGS="-g -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
--enable-all-static --disable-shared CC=icc CFLAGS="-g -fast -openmp" AR=xiar LD=xild
# CC=gcc CFLAGS="-g -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
;;
# i386-pc-solaris2.10
grim | mil* )
......
......@@ -17914,7 +17914,7 @@ $as_echo "suppressed" >&6; }
fi
 
# ----------------------------------------------------------------------
# How to build CDI into CDI?
# How to build CDI into CDO?
INTERNAL_CDI_DIR=libcdi
# At the moment, there are two possible CDI bindings
# (default) linking directly to CDI's object files, i.e. a libtool
......
......@@ -280,7 +280,7 @@ AC_ARG_WITH([proj],
[AC_MSG_CHECKING([for the PROJ library])
AC_MSG_RESULT([suppressed])])
# ----------------------------------------------------------------------
# How to build CDI into CDI?
# How to build CDI into CDO?
INTERNAL_CDI_DIR=libcdi
# At the moment, there are two possible CDI bindings
# (default) linking directly to CDI's object files, i.e. a libtool
......
## Process this file with automake to produce Makefile.in
#
bin_PROGRAMS = cdo
bin_PROGRAMS =
if ENABLE_ALL_STATIC
bin_PROGRAMS += cdo_static
else
bin_PROGRAMS += cdo
endif
#
cdo_SOURCES = cdo.c
......@@ -282,6 +284,10 @@ cdotest_SOURCES = cdo_int.h \
cdotest.c
cdotest_LDADD = $(cdo_LDADD)
cdotest_CPPFLAGS = $(cdo_CPPFLAGS)
cdotest_LDFLAGS = $(cdo_LDFLAGS)
if ENABLE_ALL_STATIC
cdotest_LDFLAGS += -all-static
endif
cdo-userlog.o: userlog.c config.h
$(COMPILE) -DLOGPATH=${exec_prefix}/log -c -o cdo-userlog.o `test -f 'userlog.c' || echo '$(srcdir)/'`userlog.c
......
......@@ -34,9 +34,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = cdo$(EXEEXT) $(am__EXEEXT_1)
bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
@ENABLE_ALL_STATIC_TRUE@am__append_1 = cdo_static
@ENABLE_ALL_STATIC_FALSE@am__append_2 = cdo
noinst_PROGRAMS = cdotest$(EXEEXT)
@ENABLE_ALL_STATIC_TRUE@am__append_3 = -all-static
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in
......@@ -53,6 +55,7 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@ENABLE_ALL_STATIC_TRUE@am__EXEEXT_1 = cdo_static$(EXEEXT)
@ENABLE_ALL_STATIC_FALSE@am__EXEEXT_2 = cdo$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Arith.$(OBJEXT) \
......@@ -284,6 +287,9 @@ cdo_static_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
am_cdotest_OBJECTS = cdotest-cdotest.$(OBJEXT)
cdotest_OBJECTS = $(am_cdotest_OBJECTS)
cdotest_DEPENDENCIES = $(am__DEPENDENCIES_1)
cdotest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(cdotest_LDFLAGS) \
$(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
......@@ -513,6 +519,7 @@ cdotest_SOURCES = cdo_int.h \
 
cdotest_LDADD = $(cdo_LDADD)
cdotest_CPPFLAGS = $(cdo_CPPFLAGS)
cdotest_LDFLAGS = $(cdo_LDFLAGS) $(am__append_3)
#
CLEANFILES = `ls *~`
all: config.h
......@@ -627,7 +634,7 @@ cdo_static$(EXEEXT): $(cdo_static_OBJECTS) $(cdo_static_DEPENDENCIES)
$(cdo_static_LINK) $(cdo_static_OBJECTS) $(cdo_static_LDADD) $(LIBS)
cdotest$(EXEEXT): $(cdotest_OBJECTS) $(cdotest_DEPENDENCIES)
@rm -f cdotest$(EXEEXT)
$(LINK) $(cdotest_OBJECTS) $(cdotest_LDADD) $(LIBS)
$(cdotest_LINK) $(cdotest_OBJECTS) $(cdotest_LDADD) $(LIBS)
 
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......
Markdown is supported
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