Index: src/examples/Makefile.am =================================================================== --- src/examples/Makefile.am (revision 00cc023285120a85a7e80e417220f36483ebd413) +++ src/examples/Makefile.am (revision 5cb5f842b3a6b217c0d43c78383ba66bb7658282) @@ -11,18 +11,16 @@ ## Created On : Sun May 31 09:08:15 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Sun May 31 12:32:19 2015 -## Update Count : 17 +## Last Modified On : Sun May 31 14:16:58 2015 +## Update Count : 21 ############################################################################### # create object files in directory with source files -AUTOMAKE_OPTIONS = subdir-objects +#AUTOMAKE_OPTIONS = subdir-objects # applies to both programs -AM_CFLAGS = -g -Wall -Wno-unused-function # does not build with -O2 +CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2 CC = @CFA_BINDIR@/cfa -# TEMPORARY: replace COMPILE to remove CFLAGS containing -O2 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) # $(CFLAGS) noinst_PROGRAMS = fstream_test vector_test -fstream_test_SOURCES = ${srcdir}/iostream.c ${srcdir}/fstream.c ${srcdir}/fstream_test.c -vector_test_SOURCES = ${srcdir}/vector_int.c ${srcdir}/fstream.c ${srcdir}/iostream.c ${srcdir}/array.c ${srcdir}/iterator.c ${srcdir}/vector_test.c +fstream_test_SOURCES = iostream.c fstream.c fstream_test.c +vector_test_SOURCES = vector_int.c fstream.c iostream.c array.c iterator.c vector_test.c Index: src/examples/Makefile.in =================================================================== --- src/examples/Makefile.in (revision 00cc023285120a85a7e80e417220f36483ebd413) +++ src/examples/Makefile.in (revision 5cb5f842b3a6b217c0d43c78383ba66bb7658282) @@ -18,4 +18,7 @@ ######################## -*- Mode: Makefile-Automake -*- ###################### ############################################################################### + +# create object files in directory with source files +#AUTOMAKE_OPTIONS = subdir-objects VPATH = @srcdir@ @@ -48,13 +51,11 @@ CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am__dirstamp = $(am__leading_dot)dirstamp -am_fstream_test_OBJECTS = ${srcdir}/iostream.$(OBJEXT) \ - ${srcdir}/fstream.$(OBJEXT) ${srcdir}/fstream_test.$(OBJEXT) +am_fstream_test_OBJECTS = iostream.$(OBJEXT) fstream.$(OBJEXT) \ + fstream_test.$(OBJEXT) fstream_test_OBJECTS = $(am_fstream_test_OBJECTS) fstream_test_LDADD = $(LDADD) -am_vector_test_OBJECTS = ${srcdir}/vector_int.$(OBJEXT) \ - ${srcdir}/fstream.$(OBJEXT) ${srcdir}/iostream.$(OBJEXT) \ - ${srcdir}/array.$(OBJEXT) ${srcdir}/iterator.$(OBJEXT) \ - ${srcdir}/vector_test.$(OBJEXT) +am_vector_test_OBJECTS = vector_int.$(OBJEXT) fstream.$(OBJEXT) \ + iostream.$(OBJEXT) array.$(OBJEXT) iterator.$(OBJEXT) \ + vector_test.$(OBJEXT) vector_test_OBJECTS = $(am_vector_test_OBJECTS) vector_test_LDADD = $(LDADD) @@ -63,4 +64,6 @@ am__depfiles_maybe = depfiles am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -84,5 +87,7 @@ CFA_LIBDIR = @CFA_LIBDIR@ CFA_PREFIX = @CFA_PREFIX@ -CFLAGS = @CFLAGS@ + +# applies to both programs +CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2 CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -169,14 +174,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# create object files in directory with source files -AUTOMAKE_OPTIONS = subdir-objects - -# applies to both programs -AM_CFLAGS = -g -Wall -Wno-unused-function # does not build with -O2 -# TEMPORARY: replace COMPILE to remove CFLAGS containing -O2 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) # $(CFLAGS) -fstream_test_SOURCES = ${srcdir}/iostream.c ${srcdir}/fstream.c ${srcdir}/fstream_test.c -vector_test_SOURCES = ${srcdir}/vector_int.c ${srcdir}/fstream.c ${srcdir}/iostream.c ${srcdir}/array.c ${srcdir}/iterator.c ${srcdir}/vector_test.c +fstream_test_SOURCES = iostream.c fstream.c fstream_test.c +vector_test_SOURCES = vector_int.c fstream.c iostream.c array.c iterator.c vector_test.c all: all-am @@ -216,27 +213,7 @@ clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -${srcdir}/$(am__dirstamp): - @$(MKDIR_P) ${srcdir} - @: > ${srcdir}/$(am__dirstamp) -${srcdir}/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) ${srcdir}/$(DEPDIR) - @: > ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/iostream.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/fstream.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/fstream_test.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES) @rm -f fstream_test$(EXEEXT) $(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) -${srcdir}/vector_int.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/array.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/iterator.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) -${srcdir}/vector_test.$(OBJEXT): ${srcdir}/$(am__dirstamp) \ - ${srcdir}/$(DEPDIR)/$(am__dirstamp) vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES) @rm -f vector_test$(EXEEXT) @@ -245,38 +222,29 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f ${srcdir}/array.$(OBJEXT) - -rm -f ${srcdir}/fstream.$(OBJEXT) - -rm -f ${srcdir}/fstream_test.$(OBJEXT) - -rm -f ${srcdir}/iostream.$(OBJEXT) - -rm -f ${srcdir}/iterator.$(OBJEXT) - -rm -f ${srcdir}/vector_int.$(OBJEXT) - -rm -f ${srcdir}/vector_test.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/array.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/fstream.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/fstream_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/iostream.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/iterator.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/vector_int.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@${srcdir}/$(DEPDIR)/vector_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iostream.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iterator.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_test.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -392,6 +360,4 @@ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f ${srcdir}/$(DEPDIR)/$(am__dirstamp) - -rm -f ${srcdir}/$(am__dirstamp) maintainer-clean-generic: @@ -403,5 +369,5 @@ distclean: distclean-am - -rm -rf ${srcdir}/$(DEPDIR) + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ @@ -449,5 +415,5 @@ maintainer-clean: maintainer-clean-am - -rm -rf ${srcdir}/$(DEPDIR) + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic