[xserver-commit] cygwin-x-doc/ug/figures Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xserver/cygwin-x-doc/ug/figures
In directory pdx:/tmp/cvs-serv1606/ug/figures

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Finally do a proper implementation for building when builddir != srcdir for an arbitrary builddir.

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/figures/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/Makefile.am	5 Sep 2003 17:38:11 -0000	1.1.1.1
+++ b/Makefile.am	29 Feb 2004 23:36:11 -0000	1.2
@@ -1,14 +1,43 @@
-extra_ug_figures = cyi01welcome.ps cyi02installoption.ps \
-	cyi03installto.ps cyi04directory.ps \
-	cyi05proxy.ps cyi06mirror.ps \
-	cyi07packages.ps cyi08downloading.ps \
-	cyi09installing.ps cyi10createicons.ps \
+extra_ug_figures = \
+	cyi01welcome.ps \
+	cyi02installoption.ps \
+	cyi03installto.ps \
+	cyi04directory.ps \
+	cyi05proxy.ps \
+	cyi06mirror.ps \
+	cyi07packages.ps \
+	cyi08downloading.ps \
+	cyi09installing.ps \
+	cyi10createicons.ps \
 	cyi11complete.ps \
-	cyi01welcome.png cyi02installoption.png \
-	cyi03installto.png cyi04directory.png \
-	cyi05proxy.png cyi06mirror.png \
-	cyi07packages.png cyi08downloading.png \
-	cyi09installing.png cyi10createicons.png \
+	cyi01welcome.png \
+	cyi02installoption.png \
+	cyi03installto.png \
+	cyi04directory.png \
+	cyi05proxy.png \
+	cyi06mirror.png \
+	cyi07packages.png \
+	cyi08downloading.png \
+	cyi09installing.png \
+	cyi10createicons.png \
 	cyi11complete.png
 
-EXTRA_DIST = $(extra_ug_figures)
\ No newline at end of file
+EXTRA_DIST = $(extra_ug_figures)
+
+all:
+	if test $(srcdir) != @builddir@ ; then \
+		cd @builddir@ && \
+		for file in $(extra_ug_figures) ; do \
+			if test -L @builddir@/$$file ; then \
+				rm -f @builddir@/$$file ; \
+			fi ; \
+			$(LN_S) $(srcdir)/$$file @builddir@/$$file ; \
+		done ; \
+	fi
+
+clean:
+	for file in $(extra_ug_figures) ; do \
+		if test -L @builddir@/$$file ; then \
+			rm -f @builddir@/$$file ; \
+		fi ; \
+	done

Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/figures/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/Makefile.in	5 Sep 2003 17:38:11 -0000	1.1.1.1
+++ b/Makefile.in	29 Feb 2004 23:36:11 -0000	1.2
@@ -63,13 +63,14 @@
 HAVE_LIB = @HAVE_LIB@
 JADE = @JADE@
 LIB = @LIB@
+LN_S = @LN_S@
 LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-extra_ug_figures = cyi01welcome.ps cyi02installoption.ps 	cyi03installto.ps cyi04directory.ps 	cyi05proxy.ps cyi06mirror.ps 	cyi07packages.ps cyi08downloading.ps 	cyi09installing.ps cyi10createicons.ps 	cyi11complete.ps 	cyi01welcome.png cyi02installoption.png 	cyi03installto.png cyi04directory.png 	cyi05proxy.png cyi06mirror.png 	cyi07packages.png cyi08downloading.png 	cyi09installing.png cyi10createicons.png 	cyi11complete.png
+extra_ug_figures =  	cyi01welcome.ps 	cyi02installoption.ps 	cyi03installto.ps 	cyi04directory.ps 	cyi05proxy.ps 	cyi06mirror.ps 	cyi07packages.ps 	cyi08downloading.ps 	cyi09installing.ps 	cyi10createicons.ps 	cyi11complete.ps 	cyi01welcome.png 	cyi02installoption.png 	cyi03installto.png 	cyi04directory.png 	cyi05proxy.png 	cyi06mirror.png 	cyi07packages.png 	cyi08downloading.png 	cyi09installing.png 	cyi10createicons.png 	cyi11complete.png
 
 
 EXTRA_DIST = $(extra_ug_figures)
@@ -85,9 +86,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ug/figures/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign ug/figures/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -100,6 +101,11 @@
 subdir = ug/figures
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign ug/figures/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -171,6 +177,24 @@
 mostlyclean distclean maintainer-clean
 
 
+all:
+	if test $(srcdir) != @builddir@ ; then \
+		cd @builddir@ && \
+		for file in $(extra_ug_figures) ; do \
+			if test -L @builddir@/$$file ; then \
+				rm -f @builddir@/$$file ; \
+			fi ; \
+			$(LN_S) $(srcdir)/$$file @builddir@/$$file ; \
+		done ; \
+	fi
+
+clean:
+	for file in $(extra_ug_figures) ; do \
+		if test -L @builddir@/$$file ; then \
+			rm -f @builddir@/$$file ; \
+		fi ; \
+	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: