[patch] Makefile.in fix

glib-2.18.4-BJA-strfuncs-std99-Makefile.in.diff (text/plain), 4.00 KB, created by Bertrand Jacquin on 2009-05-04 18:41:57 UTC

--- glib/tests/Makefile.in.ori	2009-05-04 17:30:55.000000000 +0200
+++ glib/tests/Makefile.in	2009-05-04 17:34:23.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,7 +76,7 @@
 am_rand_OBJECTS = rand.$(OBJEXT)
 rand_OBJECTS = $(am_rand_OBJECTS)
 rand_DEPENDENCIES = $(progs_ldadd)
-am_strfuncs_OBJECTS = strfuncs.$(OBJEXT)
+am_strfuncs_OBJECTS = strfuncs-strfuncs.$(OBJEXT)
 strfuncs_OBJECTS = $(am_strfuncs_OBJECTS)
 strfuncs_DEPENDENCIES = $(progs_ldadd)
 am_string_OBJECTS = string.$(OBJEXT)
@@ -336,6 +336,7 @@
 rand_SOURCES = rand.c
 rand_LDADD = $(progs_ldadd) -lm
 strfuncs_SOURCES = strfuncs.c
+strfuncs_CPPFLAGS = -D_ISOC99_SOURCE
 strfuncs_LDADD = $(progs_ldadd) -lm
 string_SOURCES = string.c
 string_LDADD = $(progs_ldadd) -lm
@@ -355,8 +356,8 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -431,7 +432,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/option-context.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rand.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strfuncs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strfuncs-strfuncs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testing.Po@am__quote@
 
@@ -456,6 +457,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+strfuncs-strfuncs.o: strfuncs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strfuncs-strfuncs.o -MD -MP -MF $(DEPDIR)/strfuncs-strfuncs.Tpo -c -o strfuncs-strfuncs.o `test -f 'strfuncs.c' || echo '$(srcdir)/'`strfuncs.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/strfuncs-strfuncs.Tpo $(DEPDIR)/strfuncs-strfuncs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='strfuncs.c' object='strfuncs-strfuncs.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strfuncs-strfuncs.o `test -f 'strfuncs.c' || echo '$(srcdir)/'`strfuncs.c
+
+strfuncs-strfuncs.obj: strfuncs.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strfuncs-strfuncs.obj -MD -MP -MF $(DEPDIR)/strfuncs-strfuncs.Tpo -c -o strfuncs-strfuncs.obj `if test -f 'strfuncs.c'; then $(CYGPATH_W) 'strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/strfuncs.c'; fi`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/strfuncs-strfuncs.Tpo $(DEPDIR)/strfuncs-strfuncs.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='strfuncs.c' object='strfuncs-strfuncs.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(strfuncs_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strfuncs-strfuncs.obj `if test -f 'strfuncs.c'; then $(CYGPATH_W) 'strfuncs.c'; else $(CYGPATH_W) '$(srcdir)/strfuncs.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -467,7 +482,7 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS