Changeset 1632

Timestamp:

Mar 19, 2023, 6:15:02 AM (6 months ago)

Author:

Peter Johansson

Message:

split make rule for Portfile.diff into multiple targets

File:

• trunk/Makefile.am (modified) (2 diffs)

trunk/Makefile.am

@@ -95 +95 @@
 macport_url = https://svn.macports.org/repository/macports/trunk/dports/devel/svndigest
 
-build_support/Portfile.diff: build_support/Portfile FORCE
-  test -e build_support/macport \
-  || svn co $(macport_url) build_support/macport
-  svn revert -R build_support/macport
-  svn update build_support/macport
-  cp build_support/Portfile build_support/macport/Portfile
-  svn diff build_support/macport/Portfile > $@
-  svn revert build_support/macport/Portfile
+build_support/macport/.dirstamp:
+  $(AM_V_at)$(SVN) co $(macport_url) build_support/macport
+  $(AM_V_at): > $@
+
+build_support/macport/Portfile: build_support/macport/.dirstamp FORCE
+  $(AM_V_GEN)$(SVN) revert -R build_support/macport \
+  && $(SVN) update build_support/macport
+
+build_support/Portfile.diff: build_support/Portfile \
+build_support/macport/Portfile
+  $(AM_V_GEN)cp build_support/Portfile build_support/macport/Portfile \
+  && $(SVN) diff build_support/macport/Portfile > $@ \
+  && $(SVN) revert build_support/macport/Portfile
 
 edit = $(SED) \
@@ -114 +119 @@
   $(AM_V_GEN)openssl rmd160 $(distdir).tar.gz > $@
 
-build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in $(distdir).tar.gz.sha256 $(distdir).tar.gz.rmd160
-  @rm -f $@ $@.t
-  @sha256=`cut -f 2 -d ' ' $(distdir).tar.gz.sha256`;\
+build_support/Portfile: Makefile build_support/Portfile.in $(distdir).tar.gz.sha256 $(distdir).tar.gz.rmd160
+  $(AM_V_GEN)rm -f $@ $@.t; \
+  sha256=`cut -f 2 -d ' ' $(distdir).tar.gz.sha256`;\
   rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
   $(edit) -e "s|@SHA256SUM[@]|$$sha256|g" \
   -e "s|@RMD160SUM[@]|$$rmd160|g" \
-  '$(srcdir)/build_support/Portfile.in' > $@.t
-  @chmod a-w $@.t
-  @mv $@.t $@
-  @echo "creating $@"
+  '$(srcdir)/build_support/Portfile.in' > $@.t; \
+  chmod a-w $@.t; \
+  mv $@.t $@