Skip to content
Snippets Groups Projects
Commit 49b64d9d authored by Ralf Mueller's avatar Ralf Mueller
Browse files

use CdoCdiBuild gem instead of a local file

parent 4b80aa3f
No related branches found
No related tags found
No related merge requests found
require '~/.rake/CdoCdi' require 'CdoCdiBuild'
class CdiBuild < CdoCdiBuild class CdiBuild < CdoCdiBuild
def generateTasks def generateTasks
super super
...@@ -11,5 +11,5 @@ class CdiBuild < CdoCdiBuild ...@@ -11,5 +11,5 @@ class CdiBuild < CdoCdiBuild
end end
end end
build = CdiBuild.new('~/.rake_cdi.json') build = CdiBuild.new(ENV['HOME']+'/.rake_cdi.json')
build.generateTasks build.generateTasks
...@@ -20,6 +20,9 @@ if CREATE_ISOC ...@@ -20,6 +20,9 @@ if CREATE_ISOC
endif endif
else else
noinst_LTLIBRARIES += libcdi.la noinst_LTLIBRARIES += libcdi.la
if CREATE_ISOC
noinst_LTLIBRARIES += libcdi_f2003.la
endif
endif endif
...@@ -174,6 +177,9 @@ EXTRA_DIST += \ ...@@ -174,6 +177,9 @@ EXTRA_DIST += \
libcdi_f2003_la_SOURCES = mo_cdi.f90
libcdi_f2003_la_LIBADD = libcdi.la
libcdiresunpack_la_SOURCES = \ libcdiresunpack_la_SOURCES = \
resource_unpack.c resource_unpack.c
...@@ -236,9 +242,6 @@ endif ...@@ -236,9 +242,6 @@ endif
libcdipio_la_LIBADD = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C_LIB) libcdipio_la_LIBADD = libcdi.la $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C_LIB)
libcdi_f2003_la_SOURCES = mo_cdi.f90
libcdi_f2003_la_LIBADD = libcdi.la
# #
#cdilib.c: #cdilib.c:
# $(top_srcdir)/src/make_cdilib $(top_srcdir)/src # $(top_srcdir)/src/make_cdilib $(top_srcdir)/src
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment