Attachment #244101 for bug #333871

View | Details | Raw Unified | Return to bug 333871
Collapse All | Expand All




    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
    if test "$$first" != "."; then \
      if test "$$first" = ".."; then \
	dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
	dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
      else \
	first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
	if test "$$first2" = "$$first"; then \
	  dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
	else \
	  dir2="../$$dir2"; \
	fi; \
	dir0="$$dir0"/"$$first"; \
      fi; \
    fi; \
    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

	  case '$(am__configure_deps)' in \
	    *$$dep*) \
	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
		&& { if test -f $@; then exit 0; else break; fi; }; \
	      exit 1;; \
	  esac; \
	done; \

	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
	    ($(am__cd) $$subdir && \
	      $(MAKE) $(AM_MAKEFLAGS) \
		top_distdir="$$new_top_distdir" \
		distdir="$$new_distdir" \
		am__remove_distdir=: \
		am__skip_length_check=: \
		am__skip_mode_fix=: \
		distdir) \
	      || exit 1; \
	  fi; \
	done



$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
	|| ( rm -f gtkextra-marshal.tmp && exit 1 )

$(srcdir)/gtkextratypebuiltins.h: $(public_h_sources)
	( cd $(srcdir) && glib-mkenums \

Return to bug 333871

Lines 106-121 Link Here

(-)gtkextra/Makefile.in-orig (-19 / +19 lines)
106	first=`echo "$$dir1" \| sed -e "$$sed_first"`; \	106	first=`echo "$$dir1" \| sed -e "$$sed_first"`; \
107	if test "$$first" != "."; then \	107	if test "$$first" != "."; then \
108	if test "$$first" = ".."; then \	108	if test "$$first" = ".."; then \
109	dir2=`echo "$$dir0" \| sed -e "$$sed_last"`/"$$dir2"; \	109	dir2=`echo "$$dir0" \| sed -e "$$sed_last"`/"$$dir2"; \
110	dir0=`echo "$$dir0" \| sed -e "$$sed_butlast"`; \	110	dir0=`echo "$$dir0" \| sed -e "$$sed_butlast"`; \
111	else \	111	else \
112	first2=`echo "$$dir2" \| sed -e "$$sed_first"`; \	112	first2=`echo "$$dir2" \| sed -e "$$sed_first"`; \
113	if test "$$first2" = "$$first"; then \	113	if test "$$first2" = "$$first"; then \
114	dir2=`echo "$$dir2" \| sed -e "$$sed_rest"`; \	114	dir2=`echo "$$dir2" \| sed -e "$$sed_rest"`; \
115	else \	115	else \
116	dir2="../$$dir2"; \	116	dir2="../$$dir2"; \
117	fi; \	117	fi; \
118	dir0="$$dir0"/"$$first"; \	118	dir0="$$dir0"/"$$first"; \
119	fi; \	119	fi; \
120	fi; \	120	fi; \
121	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \	121	dir1=`echo "$$dir1" \| sed -e "$$sed_rest"`; \
Lines 391-397 Link Here
391	case '$(am__configure_deps)' in \	391	case '$(am__configure_deps)' in \
392	$$dep) \	392	$$dep) \
393	( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \	393	( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
394	&& { if test -f $@; then exit 0; else break; fi; }; \	394	&& { if test -f $@; then exit 0; else break; fi; }; \
395	exit 1;; \	395	exit 1;; \
396	esac; \	396	esac; \
397	done; \	397	done; \
Lines 670-681 Link Here
670	echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \	670	echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
671	($(am__cd) $$subdir && \	671	($(am__cd) $$subdir && \
672	$(MAKE) $(AM_MAKEFLAGS) \	672	$(MAKE) $(AM_MAKEFLAGS) \
673	top_distdir="$$new_top_distdir" \	673	top_distdir="$$new_top_distdir" \
674	distdir="$$new_distdir" \	674	distdir="$$new_distdir" \
675	am__remove_distdir=: \	675	am__remove_distdir=: \
676	am__skip_length_check=: \	676	am__skip_length_check=: \
677	am__skip_mode_fix=: \	677	am__skip_mode_fix=: \
678	distdir) \	678	distdir) \
679	\|\| exit 1; \	679	\|\| exit 1; \
680	fi; \	680	fi; \
681	done	681	done
Lines 800-812 Link Here
800		800
801		801
802	$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list	802	$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
803	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \	803	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
804	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \	804	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
805	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )	805	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )
806	$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h	806	$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
807	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \	807	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
808	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \	808	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
809	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )	809	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )
810		810
811	$(srcdir)/gtkextratypebuiltins.h: $(public_h_sources)	811	$(srcdir)/gtkextratypebuiltins.h: $(public_h_sources)
812	( cd $(srcdir) && glib-mkenums \	812	( cd $(srcdir) && glib-mkenums \