Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
cdo
Commits
dab8a688
Commit
dab8a688
authored
Aug 22, 2015
by
Uwe Schulzweida
Browse files
src/Makefile.am: removed -lstd++ (bug fix)
parent
0a30bfbe
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
dab8a688
...
...
@@ -3,6 +3,10 @@
* using CDI library version 1.7.0
* Version 1.7.0 released
2015-08-22 Uwe Schulzweida
* src/Makefile.am: removed -lstd++ (bug fix)
2015-08-19 Uwe Schulzweida
* expr: added support for calculations with var1[n] and var2[1]
...
...
aclocal.m4
View file @
dab8a688
...
...
@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.6
9
],,
[m4_warning([this file was generated for autoconf 2.6
9
.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.6
8
],,
[m4_warning([this file was generated for autoconf 2.6
8
.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
...
...
configure
View file @
dab8a688
This diff is collapsed.
Click to expand it.
src/Makefile.am
View file @
dab8a688
...
...
@@ -370,7 +370,7 @@ cdo_SOURCES += Magplot.c \
endif
cdo_CPPFLAGS
=
-I
$(top_srcdir)
/libcdi/src
cdo_LDADD
=
libcdo.la
$(top_builddir)
/libcdi/src/libcdi.la
-lstdc
++
cdo_LDADD
=
libcdo.la
$(top_builddir)
/libcdi/src/libcdi.la
cdo_LDFLAGS
=
if
ENABLE_ALL_STATIC
...
...
src/Makefile.in
View file @
dab8a688
...
...
@@ -314,8 +314,7 @@ cdo_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(CXXFLAGS) $(cdo_LDFLAGS) $(LDFLAGS) -o $@
am_cdotest_OBJECTS = cdotest-cdotest.$(OBJEXT)
cdotest_OBJECTS = $(am_cdotest_OBJECTS)
am__DEPENDENCIES_1 = libcdo.la $(top_builddir)/libcdi/src/libcdi.la
cdotest_DEPENDENCIES = $(am__DEPENDENCIES_1)
cdotest_DEPENDENCIES = $(cdo_LDADD)
cdotest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(cdotest_LDFLAGS) $(LDFLAGS) -o $@
...
...
@@ -646,7 +645,7 @@ cdo_SOURCES = cdo.c Adisit.c Afterburner.c Arith.c Arithc.c \
Yhourstat.c Ymonarith.c Ymonpctl.c Ymonstat.c Yseaspctl.c \
Yseasstat.c Zonstat.c cdo.h $(am__append_1) $(am__append_2)
cdo_CPPFLAGS = -I$(top_srcdir)/libcdi/src
cdo_LDADD = libcdo.la $(top_builddir)/libcdi/src/libcdi.la
-lstdc++
cdo_LDADD = libcdo.la $(top_builddir)/libcdi/src/libcdi.la
cdo_LDFLAGS = $(am__append_3)
libcdo_la_CPPFLAGS = $(cdo_CPPFLAGS)
cdotest_SOURCES = cdo_int.h \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment