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

Fix automake 1.14 subdir-objects warning.

* This change creates an archive containing resource_unpack.c only for
  use in test programs.
parent a2eb8bc4
......@@ -2,11 +2,13 @@
#
EXTRA_DIST = cdilib.c mo_cdi.f90
noinst_LTLIBRARIES = libcdiresunpack.la
if ENABLE_CDI_LIB
lib_LTLIBRARIES = libcdi.la
include_HEADERS = cdi.h cdi.inc
else
noinst_LTLIBRARIES = libcdi.la
noinst_LTLIBRARIES += libcdi.la
endif
AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS)
......@@ -109,6 +111,9 @@ libcdi_la_SOURCES = \
stream.c \
swap.c
libcdiresunpack_la_SOURCES = \
resource_unpack.c
if USE_MPI
if ENABLE_CDI_LIB
lib_LTLIBRARIES += libcdipio.la
......
......@@ -79,17 +79,18 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_1 = libcdipio.la
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_2 = cdipio.h cdipio.inc
@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.$(OBJEXT)
@ENABLE_CDI_LIB_FALSE@am__append_1 = libcdi.la
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_2 = libcdipio.la
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_3 = cdipio.h cdipio.inc
@ENABLE_CDI_LIB_FALSE@@USE_MPI_TRUE@am__append_4 = libcdipio.la
@ENABLE_CDI_LIB_TRUE@am__append_5 = pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_6 = pkgconfig/cdipio.pc
@CREATE_ISOC_TRUE@am__append_7 = mo_cdi.$(OBJEXT)
#CLEANFILES += cdilib.c
@CREATE_ISOC_TRUE@am__append_7 = mo_cdi.$(FCMODEXT) mo_cdi.$(OBJEXT) mo_cdi.f90
@ENABLE_CDI_LIB_TRUE@am__append_8 = pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_9 = pkgconfig/cdipio.pc
@CREATE_ISOC_TRUE@am__append_8 = mo_cdi.$(FCMODEXT) mo_cdi.$(OBJEXT) mo_cdi.f90
@ENABLE_CDI_LIB_TRUE@am__append_9 = pkgconfig/cdi.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_10 = pkgconfig/cdipio.pc
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am__append_11 = pkgconfig/cdipio.pc
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/config.h.in $(top_srcdir)/config/mkinstalldirs \
......@@ -176,6 +177,9 @@ libcdipio_la_OBJECTS = $(am_libcdipio_la_OBJECTS)
@ENABLE_CDI_LIB_FALSE@@USE_MPI_TRUE@am_libcdipio_la_rpath =
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@am_libcdipio_la_rpath = -rpath \
@ENABLE_CDI_LIB_TRUE@@USE_MPI_TRUE@ $(libdir)
libcdiresunpack_la_LIBADD =
am_libcdiresunpack_la_OBJECTS = resource_unpack.lo
libcdiresunpack_la_OBJECTS = $(am_libcdiresunpack_la_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -210,8 +214,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES)
DIST_SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES)
SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES) \
$(libcdiresunpack_la_SOURCES)
DIST_SOURCES = $(libcdi_la_SOURCES) $(libcdipio_la_SOURCES) \
$(libcdiresunpack_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -430,9 +436,10 @@ top_srcdir = @top_srcdir@
#
EXTRA_DIST = cdilib.c mo_cdi.f90
@ENABLE_CDI_LIB_TRUE@lib_LTLIBRARIES = libcdi.la $(am__append_1)
@ENABLE_CDI_LIB_TRUE@include_HEADERS = cdi.h cdi.inc $(am__append_2)
@ENABLE_CDI_LIB_FALSE@noinst_LTLIBRARIES = libcdi.la $(am__append_3)
noinst_LTLIBRARIES = libcdiresunpack.la $(am__append_1) \
$(am__append_4)
@ENABLE_CDI_LIB_TRUE@lib_LTLIBRARIES = libcdi.la $(am__append_2)
@ENABLE_CDI_LIB_TRUE@include_HEADERS = cdi.h cdi.inc $(am__append_3)
AM_CFLAGS = $(PPM_CORE_CFLAGS) $(YAXT_CFLAGS)
libcdi_la_SOURCES = \
basetime.c \
......@@ -532,6 +539,9 @@ libcdi_la_SOURCES = \
stream.c \
swap.c
libcdiresunpack_la_SOURCES = \
resource_unpack.c
libcdipio_la_SOURCES = \
cdipio.h \
cdipioFortran.c \
......@@ -574,11 +584,11 @@ libcdi_la_LIBADD =
#
#cdilib.o: cdilib.c
# $(COMPILE) -c $<
LOCALTARGETS = $(am__append_4) $(am__append_5) $(am__append_6)
LOCALTARGETS = $(am__append_5) $(am__append_6) $(am__append_7)
#
CLEANFILES = `ls *~` $(am__append_7) $(am__append_8) $(am__append_9)
CLEANFILES = `ls *~` $(am__append_8) $(am__append_9) $(am__append_10)
@ENABLE_CDI_LIB_TRUE@PKGCONFIG_FILES = pkgconfig/cdi.pc \
@ENABLE_CDI_LIB_TRUE@ $(am__append_10)
@ENABLE_CDI_LIB_TRUE@ $(am__append_11)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
......@@ -682,6 +692,9 @@ libcdi.la: $(libcdi_la_OBJECTS) $(libcdi_la_DEPENDENCIES) $(EXTRA_libcdi_la_DEPE
libcdipio.la: $(libcdipio_la_OBJECTS) $(libcdipio_la_DEPENDENCIES) $(EXTRA_libcdipio_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(am_libcdipio_la_rpath) $(libcdipio_la_OBJECTS) $(libcdipio_la_LIBADD) $(LIBS)
libcdiresunpack.la: $(libcdiresunpack_la_OBJECTS) $(libcdiresunpack_la_DEPENDENCIES) $(EXTRA_libcdiresunpack_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libcdiresunpack_la_OBJECTS) $(libcdiresunpack_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......
......@@ -32,9 +32,8 @@ pio_write_deco2d_SOURCES = pio_write.c pio_write.h deco2d_model.c \
simple_model_helper.h simple_model_helper.c \
create_uuid.h create_uuid.c
test_resource_copy_SOURCES = test_resource_copy.c \
$(top_srcdir)/src/resource_unpack.c \
create_uuid.h create_uuid.c
test_resource_copy_LDADD = $(UUID_C_LIB) $(LDADD)
test_resource_copy_LDADD = $(UUID_C_LIB) ../src/libcdiresunpack.la $(LDADD)
test_resource_copy_mpi_SOURCES = test_resource_copy.c \
create_uuid.h create_uuid.c
test_cdf_write_SOURCES = test_cdf_write.c
......
......@@ -187,10 +187,10 @@ test_grib_OBJECTS = $(am_test_grib_OBJECTS)
test_grib_LDADD = $(LDADD)
test_grib_DEPENDENCIES = ../src/libcdi.la
am_test_resource_copy_OBJECTS = test_resource_copy.$(OBJEXT) \
resource_unpack.$(OBJEXT) create_uuid.$(OBJEXT)
create_uuid.$(OBJEXT)
test_resource_copy_OBJECTS = $(am_test_resource_copy_OBJECTS)
test_resource_copy_DEPENDENCIES = $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
../src/libcdiresunpack.la $(am__DEPENDENCIES_1)
am_test_resource_copy_mpi_OBJECTS = \
test_resource_copy_mpi-test_resource_copy.$(OBJEXT) \
test_resource_copy_mpi-create_uuid.$(OBJEXT)
......@@ -503,10 +503,9 @@ pio_write_deco2d_SOURCES = pio_write.c pio_write.h deco2d_model.c \
create_uuid.h create_uuid.c
test_resource_copy_SOURCES = test_resource_copy.c \
$(top_srcdir)/src/resource_unpack.c \
create_uuid.h create_uuid.c
test_resource_copy_LDADD = $(UUID_C_LIB) $(LDADD)
test_resource_copy_LDADD = $(UUID_C_LIB) ../src/libcdiresunpack.la $(LDADD)
test_resource_copy_mpi_SOURCES = test_resource_copy.c \
create_uuid.h create_uuid.c
......@@ -666,7 +665,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deco2d_model.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ensure_array_size.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio_write.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_unpack.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_model.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_model_helper.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_cksum.Po@am__quote@
......@@ -699,20 +697,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
resource_unpack.o: $(top_srcdir)/src/resource_unpack.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource_unpack.o -MD -MP -MF $(DEPDIR)/resource_unpack.Tpo -c -o resource_unpack.o `test -f '$(top_srcdir)/src/resource_unpack.c' || echo '$(srcdir)/'`$(top_srcdir)/src/resource_unpack.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/resource_unpack.Tpo $(DEPDIR)/resource_unpack.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/resource_unpack.c' object='resource_unpack.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource_unpack.o `test -f '$(top_srcdir)/src/resource_unpack.c' || echo '$(srcdir)/'`$(top_srcdir)/src/resource_unpack.c
resource_unpack.obj: $(top_srcdir)/src/resource_unpack.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT resource_unpack.obj -MD -MP -MF $(DEPDIR)/resource_unpack.Tpo -c -o resource_unpack.obj `if test -f '$(top_srcdir)/src/resource_unpack.c'; then $(CYGPATH_W) '$(top_srcdir)/src/resource_unpack.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/resource_unpack.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/resource_unpack.Tpo $(DEPDIR)/resource_unpack.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/resource_unpack.c' object='resource_unpack.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o resource_unpack.obj `if test -f '$(top_srcdir)/src/resource_unpack.c'; then $(CYGPATH_W) '$(top_srcdir)/src/resource_unpack.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/resource_unpack.c'; fi`
test_resource_copy_mpi-test_resource_copy.o: test_resource_copy.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_resource_copy_mpi_CFLAGS) $(CFLAGS) -MT test_resource_copy_mpi-test_resource_copy.o -MD -MP -MF $(DEPDIR)/test_resource_copy_mpi-test_resource_copy.Tpo -c -o test_resource_copy_mpi-test_resource_copy.o `test -f 'test_resource_copy.c' || echo '$(srcdir)/'`test_resource_copy.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_resource_copy_mpi-test_resource_copy.Tpo $(DEPDIR)/test_resource_copy_mpi-test_resource_copy.Po
......
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