No commit message

No commit message

No commit message
ebaa5dfe · Uwe Schulzweida · 2bc84b38 · ebaa5dfe · ebaa5dfe · ebaa5dfe
Commit ebaa5dfe authored Nov 12, 2009 by Uwe Schulzweida
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
 ## Process this file with automake to produce Makefile.in
 #
-  noinst_PROGRAMS = cdi_write cdi_read cdi_copy
+EXTRA_DIST = cdi_read_f2003.f90 cdi_write_f2003.f90
+#
+noinst_PROGRAMS = cdi_write cdi_read cdi_copy
 if CREATE_ISOC
  noinst_PROGRAMS += cdi_read_f2003 cdi_write_f2003
 endif
@@ -14,6 +16,9 @@ cdi_read_LDADD = ../src/libcdi.a $(LDFLAGS)
 cdi_copy_SOURCES = cdi_copy.c
 cdi_copy_LDADD = ../src/libcdi.a $(LDFLAGS)
 #
+cdi_read_f2003_SOURCES = cdi_read_f2003.f90
+cdi_write_f2003_SOURCES = cdi_write_f2003.f90
+#
 AM_CPPFLAGS = -I$(top_srcdir)/src
 #
 cdi_read_f2003: cdi_read_f2003.f90

--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -56,14 +56,14 @@ cdi_copy_DEPENDENCIES = ../src/libcdi.a $(am__DEPENDENCIES_1)
 am_cdi_read_OBJECTS = cdi_read.$(OBJEXT)
 cdi_read_OBJECTS = $(am_cdi_read_OBJECTS)
 cdi_read_DEPENDENCIES = ../src/libcdi.a $(am__DEPENDENCIES_1)
-cdi_read_f2003_SOURCES = cdi_read_f2003.c
-cdi_read_f2003_OBJECTS = cdi_read_f2003.$(OBJEXT)
+am_cdi_read_f2003_OBJECTS = cdi_read_f2003.$(OBJEXT)
+cdi_read_f2003_OBJECTS = $(am_cdi_read_f2003_OBJECTS)
 cdi_read_f2003_LDADD = $(LDADD)
 am_cdi_write_OBJECTS = cdi_write.$(OBJEXT)
 cdi_write_OBJECTS = $(am_cdi_write_OBJECTS)
 cdi_write_DEPENDENCIES = ../src/libcdi.a $(am__DEPENDENCIES_1)
-cdi_write_f2003_SOURCES = cdi_write_f2003.c
-cdi_write_f2003_OBJECTS = cdi_write_f2003.$(OBJEXT)
+am_cdi_write_f2003_OBJECTS = cdi_write_f2003.$(OBJEXT)
+cdi_write_f2003_OBJECTS = $(am_cdi_write_f2003_OBJECTS)
 cdi_write_f2003_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -72,10 +72,16 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(cdi_copy_SOURCES) $(cdi_read_SOURCES) cdi_read_f2003.c \
-	$(cdi_write_SOURCES) cdi_write_f2003.c
+FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS)
+FCLD = $(FC)
+FCLINK = $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+SOURCES = $(cdi_copy_SOURCES) $(cdi_read_SOURCES) \
+	$(cdi_read_f2003_SOURCES) $(cdi_write_SOURCES) \
+	$(cdi_write_f2003_SOURCES)
 DIST_SOURCES = $(cdi_copy_SOURCES) $(cdi_read_SOURCES) \
-	cdi_read_f2003.c $(cdi_write_SOURCES) cdi_write_f2003.c
+	$(cdi_read_f2003_SOURCES) $(cdi_write_SOURCES) \
+	$(cdi_write_f2003_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -185,6 +191,9 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+
+#
+EXTRA_DIST = cdi_read_f2003.f90 cdi_write_f2003.f90
 #
 cdi_write_SOURCES = cdi_write.c
 cdi_write_LDADD = ../src/libcdi.a $(LDFLAGS)
@@ -195,13 +204,16 @@ cdi_read_LDADD = ../src/libcdi.a $(LDFLAGS)
 cdi_copy_SOURCES = cdi_copy.c
 cdi_copy_LDADD = ../src/libcdi.a $(LDFLAGS)
 #
+cdi_read_f2003_SOURCES = cdi_read_f2003.f90
+cdi_write_f2003_SOURCES = cdi_write_f2003.f90
+#
 AM_CPPFLAGS = -I$(top_srcdir)/src
 #
 CLEANFILES = `ls *~`
 all: all-am

 .SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .f90 .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -252,9 +264,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_copy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_read.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_read_f2003.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_write.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdi_write_f2003.Po@am__quote@

 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -270,6 +280,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`

+.f90.o:
+	$(FCCOMPILE) -c -o $@ $<
+
+.f90.obj:
+	$(FCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \

--- a/src/Makefile.am
+++ b/src/Makefile.am
 ## Process this file with automake to produce Makefile.in
 #
+EXTRA_DIST = make_cdilib mo_cdi.f90
+#
+if CREATE_ISOC
 BUILT_SOURCES = cdilib.c
+endif
 #
 lib_LIBRARIES = libcdi.a
 #
 include_HEADERS = cdi.h cdi.inc
 #
+nodistdir = .
+nodist_include_HEADERS =
 if CREATE_ISOC
-include_HEADERS += mo_cdi.$(FCMODEXT)
+  nodist_include_HEADERS += mo_cdi.$(FCMODEXT)
 endif
 #
 libcdi_a_SOURCES = 	 \
@@ -95,11 +101,13 @@ cdiFortran.o: cdiFortran.c
 	$(CCDEPMODE) $(depcomp) \
 	$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
 #
+if CREATE_ISOC
 cdilib.c:
 	./make_cdilib
 #
 cdilib.o: cdilib.c
 	$(COMPILE) $(CFINT) $(REAL4) -c $<
+endif
 #
 all-local: $(LOCALTARGETS) 

@@ -121,4 +129,7 @@ mo_cdi.o: mo_cdi.f90
 mo_cdi.$(FCMODEXT): mo_cdi.f90
 	$(FC) $(FCFLAGS) -c $(FCFLAGS_f90) mo_cdi.f90
 #
-CLEANFILES  = `ls *~` mo_cdi.$(FCMODEXT)
+CLEANFILES  = `ls *~`
+if CREATE_ISOC
+CLEANFILES += mo_cdi.$(FCMODEXT)
+endif
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,11 +34,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-#
 @CREATE_ISOC_TRUE@am__append_1 = mo_cdi.$(FCMODEXT)
 @CREATE_ISOC_TRUE@am__append_2 = mo_cdi.o cdilib.o
+@CREATE_ISOC_TRUE@am__append_3 = mo_cdi.$(FCMODEXT)
 subdir = src
-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
@@ -54,7 +54,8 @@ am__vpath_adj = case $$p in \
    *) f=$$p;; \
  esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \
+	"$(DESTDIR)$(includedir)"
 libLIBRARIES_INSTALL = $(INSTALL_DATA)
 LIBRARIES = $(lib_LIBRARIES)
 ARFLAGS = cru
@@ -85,9 +86,9 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libcdi_a_SOURCES)
 DIST_SOURCES = $(libcdi_a_SOURCES)
-am__include_HEADERS_DIST = cdi.h cdi.inc mo_cdi.$(FCMODEXT)
 includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -199,11 +200,16 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@

 #
-BUILT_SOURCES = cdilib.c
+EXTRA_DIST = make_cdilib mo_cdi.f90
+#
+@CREATE_ISOC_TRUE@BUILT_SOURCES = cdilib.c
 #
 lib_LIBRARIES = libcdi.a
 #
-include_HEADERS = cdi.h cdi.inc $(am__append_1)
+include_HEADERS = cdi.h cdi.inc
+#
+nodistdir = .
+nodist_include_HEADERS = $(am__append_1)
 #
 libcdi_a_SOURCES = \
        cdiFortran.c   	 \
@@ -286,7 +292,7 @@ libcdi_a_SOURCES = \

 LOCALTARGETS = $(am__append_2)
 #
-CLEANFILES = `ls *~` mo_cdi.$(FCMODEXT)
+CLEANFILES = `ls *~` $(am__append_3)
 all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am

@@ -451,6 +457,23 @@ uninstall-includeHEADERS:
 	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
 	done
+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+	  $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+	done
+
+uninstall-nodist_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
+	done

 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -531,7 +554,7 @@ check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LIBRARIES) $(HEADERS) config.h all-local
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -581,7 +604,8 @@ info: info-am

 info-am:

-install-data-am: install-data-local install-includeHEADERS
+install-data-am: install-data-local install-includeHEADERS \
+	install-nodist_includeHEADERS

 install-dvi: install-dvi-am

@@ -616,7 +640,8 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES
+uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES \
+	uninstall-nodist_includeHEADERS

 .MAKE: install-am install-strip

@@ -628,12 +653,13 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLIBRARIES
 	install-data-local install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am \
 	install-includeHEADERS install-info install-info-am \
-	install-libLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-includeHEADERS uninstall-libLIBRARIES
+	install-libLIBRARIES install-man install-nodist_includeHEADERS \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-includeHEADERS \
+	uninstall-libLIBRARIES uninstall-nodist_includeHEADERS

 #
 cdiFortran.o: cdiFortran.c
@@ -642,11 +668,11 @@ cdiFortran.o: cdiFortran.c
 	$(CCDEPMODE) $(depcomp) \
 	$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
 #
-cdilib.c:
-	./make_cdilib
+@CREATE_ISOC_TRUE@cdilib.c:
+@CREATE_ISOC_TRUE@	./make_cdilib
 #
-cdilib.o: cdilib.c
-	$(COMPILE) $(CFINT) $(REAL4) -c $<
+@CREATE_ISOC_TRUE@cdilib.o: cdilib.c
+@CREATE_ISOC_TRUE@	$(COMPILE) $(CFINT) $(REAL4) -c $<
 #
 all-local: $(LOCALTARGETS) 
 #