Commit a52082a0 authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix race-condition and wrong suffix in mo_cdi rules.

parent 24ef129e
......@@ -169,18 +169,15 @@ endif
endif
if CREATE_ISOC
LOCALTARGETS += mo_cdi.o mo_cdi.$(FCMODEXT)
LOCALTARGETS += mo_cdi.$(OBJEXT)
endif
#
mo_cdi.f90: $(top_srcdir)/src/cdi.h
ruby $(top_srcdir)/interfaces/f2003/bindGen.rb $(top_srcdir)/src/cdi.h $@
#
mo_cdi.o: mo_cdi.f90
mo_cdi.$(OBJEXT): mo_cdi.f90
$(FC) $(FCFLAGS) -c $(FCFLAGS_f90) $<
#
mo_cdi.$(FCMODEXT): mo_cdi.f90
$(FC) $(FCFLAGS) -c $(FCFLAGS_f90) $<
pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
(cd .. ; ./config.status src/pkgconfig/cdi.pc)
......@@ -192,7 +189,7 @@ all-local: $(LOCALTARGETS)
CLEANFILES = `ls *~`
#CLEANFILES += cdilib.c
if CREATE_ISOC
CLEANFILES += $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.o
CLEANFILES += $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.$(OBJEXT)
endif
if ENABLE_CDI_LIB
......
......@@ -84,9 +84,9 @@ host_triplet = @host@
@ENABLE_CDI_LIB_FALSE@@USE_MPI_TRUE@am__append_3 = libcdipio.la
@ENABLE_CDI_LIB_TRUE@am__append_4 = pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_5 = pkgconfig/cdipio.pc
@CREATE_ISOC_TRUE@am__append_6 = mo_cdi.o mo_cdi.$(FCMODEXT)
@CREATE_ISOC_TRUE@am__append_6 = mo_cdi.$(OBJEXT)
#CLEANFILES += cdilib.c
@CREATE_ISOC_TRUE@am__append_7 = $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.o
@CREATE_ISOC_TRUE@am__append_7 = $(top_builddir)/src/mo_cdi.$(FCMODEXT) $(top_builddir)/src/mo_cdi.$(OBJEXT)
@ENABLE_CDI_LIB_TRUE@am__append_8 = pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_9 = pkgconfig/cdipio.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_10 = pkgconfig/cdipio.pc
......@@ -1018,12 +1018,9 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
mo_cdi.f90: $(top_srcdir)/src/cdi.h
ruby $(top_srcdir)/interfaces/f2003/bindGen.rb $(top_srcdir)/src/cdi.h $@
#
mo_cdi.o: mo_cdi.f90
mo_cdi.$(OBJEXT): mo_cdi.f90
$(FC) $(FCFLAGS) -c $(FCFLAGS_f90) $<
#
mo_cdi.$(FCMODEXT): mo_cdi.f90
$(FC) $(FCFLAGS) -c $(FCFLAGS_f90) $<
pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
(cd .. ; ./config.status src/pkgconfig/cdi.pc)
......
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