[m-rev.] diff: prevent test_atomic_include.h being regenerated

Julien Fischer juliensf at csse.unimelb.edu.au
Thu Jan 27 22:38:06 AEDT 2011


Branches: main, 11.01

Avoid a problem with a generated Boehm GC header file that is causing
noise in CVS diffs.

boehm_gc/libatomic_ops/tests/Makefile.am:
boehm_gc/libatomic_ops/tests/Makefile.in:
 	Stop the file test_atomic_include.h being regenerated.

Julien.

Index: boehm_gc/libatomic_ops/tests/Makefile.am
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/boehm_gc/libatomic_ops/tests/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- boehm_gc/libatomic_ops/tests/Makefile.am	23 Feb 2010 06:28:40 -0000	1.1.1.1
+++ boehm_gc/libatomic_ops/tests/Makefile.am	27 Jan 2011 11:32:44 -0000
@@ -3,8 +3,13 @@
  # We distribute test_atomic_include.h, since it's hard to regenerate
  # on Windows without sed.

-BUILT_SOURCES = test_atomic_include.h list_atomic.i
-CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+# Mercury local change: we avoid regenerating or deleting test_atomic_include.h
+# because it just causes noise in cvs diffs.
+#
+#BUILT_SOURCES = test_atomic_include.h list_atomic.i
+#CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+BUILT_SOURCES = list_atomic.i
+CLEANFILES = list_atomic.c list_atomic.i

  AM_CPPFLAGS=-I$(srcdir)/../src

Index: boehm_gc/libatomic_ops/tests/Makefile.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/boehm_gc/libatomic_ops/tests/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.in
--- boehm_gc/libatomic_ops/tests/Makefile.in	23 Feb 2010 06:28:40 -0000	1.1.1.1
+++ boehm_gc/libatomic_ops/tests/Makefile.in	27 Jan 2011 11:32:44 -0000
@@ -182,8 +182,14 @@

  # We distribute test_atomic_include.h, since it's hard to regenerate
  # on Windows without sed.
-BUILT_SOURCES = test_atomic_include.h list_atomic.i
-CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+
+# Mercury local change: we avoid regenerating or deleting test_atomic_include.h
+# because it just causes noise in cvs diffs.
+#
+#BUILT_SOURCES = test_atomic_include.h list_atomic.i
+#CLEANFILES = test_atomic_include.h list_atomic.c list_atomic.i
+BUILT_SOURCES = list_atomic.i
+CLEANFILES = list_atomic.c list_atomic.i
  AM_CPPFLAGS = -I$(srcdir)/../src
  test_atomic_SOURCES = test_atomic.c
  test_atomic_LDADD = -lpthread ../src/libatomic_ops.a

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list