2009-09-29 Ivan Maidanski <ivmai@mail.ru>

	* Makefile.am: Strip version suffix for libatomic_ops directory.
	* build_atomic_ops.sh: Ditto.
	* build_atomic_ops.sh.cygwin: Ditto.
	* configure_atomic_ops.sh: Ditto.
	* Makefile.direct: Remove AO_VERSION definition; strip version
	suffix for libatomic_ops directory.
	* NT_STATIC_THREADS_MAKEFILE: Ditto.
	* NT_X64_STATIC_THREADS_MAKEFILE: Ditto.
	* NT_X64_THREADS_MAKEFILE: Ditto.
	* gc.mak: Ditto.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 02b7613c8cde36bfc61bf253bd2f7c85d93627bb..3d853d3d208211315d5170c6b05f203ac471569e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-29  Ivan Maidanski <ivmai@mail.ru>
+
+       * Makefile.am: Strip version suffix for libatomic_ops directory.
+       * build_atomic_ops.sh: Ditto.
+       * build_atomic_ops.sh.cygwin: Ditto.
+       * configure_atomic_ops.sh: Ditto.
+       * Makefile.direct: Remove AO_VERSION definition; strip version
+       suffix for libatomic_ops directory.
+       * NT_STATIC_THREADS_MAKEFILE: Ditto.
+       * NT_X64_STATIC_THREADS_MAKEFILE: Ditto.
+       * NT_X64_THREADS_MAKEFILE: Ditto.
+       * gc.mak: Ditto.
+       * Makefile.in: Regenerate.
+
 2009-09-29  Ivan Maidanski <ivmai@mail.ru>
 
        * libatomic_ops: Rename from "libatomic_ops-1.2".

diff --git a/Makefile.am b/Makefile.am
index 13f4c8b54e7eeb0369fd6e14ff0413bbdb4df550..46fa7a8bf05a5deb7d1c8431a9268eee760385d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,8 +181,8 @@ EXTRA_DIST += extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
     include/private/msvc_dbg.h extra/msvc_dbg.c
 
 # The libatomic_ops library.  This is not ideal, since we pick up junk from
-# there.  The hard-coded version number should also go.
-EXTRA_DIST += libatomic_ops-1.2
+# there.
+EXTRA_DIST += libatomic_ops
 
 # this is an auxiliary shell file used by Makefile and Makefile.direct
 #

diff --git a/Makefile.direct b/Makefile.direct
index 35930918ade28f1b74bc6b2dc3f4d627e8740db1..4c7eac9c4d5c52d3b3981fbbc890085284a11b58 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -32,8 +32,7 @@ VPATH= $(srcdir)
 
 # Atomic_ops installation directory.  If this doesn't exist, we create
 # it from the included libatomic_ops distribution.
-AO_VERSION=1.2
-AO_SRC_DIR=$(srcdir)/libatomic_ops-$(AO_VERSION)
+AO_SRC_DIR=$(srcdir)/libatomic_ops
 AO_INSTALL_DIR=$(srcdir)/libatomic_ops-install
 
 CFLAGS= -O -I$(srcdir)/include -I$(AO_INSTALL_DIR)/include -DATOMIC_UNCOLLECTABLE -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS
@@ -740,16 +739,16 @@ dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname
        cp Makefile.direct Makefile
        CC=$(CC) ./configure_atomic_ops.sh
        cd $(AO_SRC_DIR); $(MAKE) dist
-       if test $(srcdir)/libatomic_ops-$(AO_VERSION) = $(AO_SRC_DIR); \
+       if test $(srcdir)/libatomic_ops = $(AO_SRC_DIR); \
        then \
          mv $(AO_SRC_DIR) $(AO_SRC_DIR).bak ; \
-         tar xvfz $(AO_SRC_DIR).bak/libatomic_ops-$(AO_VERSION).tar.gz ; \
+         tar xvfz $(AO_SRC_DIR).bak/libatomic_ops.tar.gz ; \
        else \
-         tar xvfz $(AO_SRC_DIR)/libatomic_ops-$(AO_VERSION).tar.gz ; \
+         tar xvfz $(AO_SRC_DIR)/libatomic_ops.tar.gz ; \
        fi
        rm -f `./gcname`
        ln -s . `./gcname`
-       ./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) libatomic_ops-$(AO_VERSION) > /tmp/gc.tar-files
+       ./add_gc_prefix $(SRCS) $(DOC_FILES) $(OTHER_FILES) libatomic_ops > /tmp/gc.tar-files
        tar cvfh gc.tar `cat /tmp/gc.tar-files`
        cp gc.tar `./gcname`.tar
        gzip `./gcname`.tar

diff --git a/Makefile.in b/Makefile.in
index 8c58402283c6f36882368673ab422a1ccc7d417a..ec604c92e3141bf4839beadc92d7de8bcc120476 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -463,23 +463,22 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 #
 
 # The libatomic_ops library.  This is not ideal, since we pick up junk from
-# there.  The hard-coded version number should also go.
+# there.
 EXTRA_DIST = gc_cpp.cpp README.QUICK BCC_MAKEFILE NT_MAKEFILE \
-       OS2_MAKEFILE PCR-Makefile digimars.mak \
-       EMX_MAKEFILE Makefile.direct Makefile.dj Makefile.DLLs \
-       SMakefile.amiga WCC_MAKEFILE build_atomic_ops.sh \
-       build_atomic_ops.sh.cygwin NT_STATIC_THREADS_MAKEFILE \
-       NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
-       extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
-       extra/if_not_there.c hpux_test_and_clear.s gc.mak \
-       extra/MacOS.c MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c \
-       extra/threadlibs.c extra/AmigaOS.c Mac_files/datastart.c \
-       Mac_files/dataend.c Mac_files/MacOS_config.h \
-       Mac_files/MacOS_Test_config.h include/private/msvc_dbg.h \
-       extra/msvc_dbg.c libatomic_ops-1.2 cord/cordbscs.c \
-       cord/cordtest.c cord/de.c cord/cordprnt.c cord/cordxtra.c \
-       cord/de_cmds.h cord/de_win.h cord/de_win.c cord/de_win.RC \
-       cord/de_win.ICO
+       OS2_MAKEFILE PCR-Makefile digimars.mak EMX_MAKEFILE \
+       Makefile.direct Makefile.dj Makefile.DLLs SMakefile.amiga \
+       WCC_MAKEFILE build_atomic_ops.sh build_atomic_ops.sh.cygwin \
+       NT_STATIC_THREADS_MAKEFILE NT_X64_STATIC_THREADS_MAKEFILE \
+       NT_X64_THREADS_MAKEFILE extra/add_gc_prefix.c extra/gcname.c \
+       extra/if_mach.c extra/if_not_there.c hpux_test_and_clear.s \
+       gc.mak extra/MacOS.c MacProjects.sit.hqx mach_dep.c \
+       extra/setjmp_t.c extra/threadlibs.c extra/AmigaOS.c \
+       Mac_files/datastart.c Mac_files/dataend.c \
+       Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
+       include/private/msvc_dbg.h extra/msvc_dbg.c libatomic_ops \
+       cord/cordbscs.c cord/cordtest.c cord/de.c cord/cordprnt.c \
+       cord/cordxtra.c cord/de_cmds.h cord/de_win.h cord/de_win.c \
+       cord/de_win.RC cord/de_win.ICO
 
 # C Library
 # ---------

diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index 7258bd625b5d2ac94ca598759ea62feb29c078aa..69a9c5b8a30e9a2b4c9e4e01f2f211bdd9b50e78 100644 (file)
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -15,8 +15,7 @@ CPU=$(MY_CPU)
 # should do, since we only need the headers.
 # We assume this was manually unpacked, since I'm not sure there is
 # a Windows standard command line tool to do this.
-AO_VERSION=1.2
-AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
+AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
 OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj

diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE
index d985bdf9fc1dfe49f98b3c399ac2537531a4030d..611604b67bd029c18c141dda1e879aa66776de9a 100644 (file)
--- a/NT_X64_STATIC_THREADS_MAKEFILE
+++ b/NT_X64_STATIC_THREADS_MAKEFILE
@@ -15,8 +15,7 @@ CPU=$(MY_CPU)
 # should do, since we only need the headers.
 # We assume this was manually unpacked, since I'm not sure there is
 # a Windows standard command line tool to do this.
-AO_VERSION=1.2
-AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
+AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
 OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj

diff --git a/NT_X64_THREADS_MAKEFILE b/NT_X64_THREADS_MAKEFILE
index 006dcf188533f55f445cee2d8d6be54bd06f1017..ee851a6c1f847c27e2365e11b05d28fffa05ed0e 100644 (file)
--- a/NT_X64_THREADS_MAKEFILE
+++ b/NT_X64_THREADS_MAKEFILE
@@ -22,8 +22,7 @@ CPU=$(MY_CPU)
 # should do, since we only need the headers.
 # We assume this was manually unpacked, since I'm not sure there is
 # a Windows standard command line tool to do this.
-AO_VERSION=1.2
-AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
+AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
 OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj

diff --git a/build_atomic_ops.sh b/build_atomic_ops.sh
index 4f740539913890fab901dec03e86ca1aa8721667..aa42decee1bc40dd4247052c18fa572e8de6c0d3 100755 (executable)
--- a/build_atomic_ops.sh
+++ b/build_atomic_ops.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 P=`pwd`/libatomic_ops-install
-cd libatomic_ops-*[0-9]
+cd libatomic_ops
 ./configure --prefix=$P
 $MAKE CC=$CC install

diff --git a/build_atomic_ops.sh.cygwin b/build_atomic_ops.sh.cygwin
index 0c24e33db132271ce0d3b76b44cb41693727af42..848a270d49bd632a49b00c8be7c2957621371766 100755 (executable)
--- a/build_atomic_ops.sh.cygwin
+++ b/build_atomic_ops.sh.cygwin
@@ -6,7 +6,7 @@ mkdir libatomic_ops-install
 P=`pwd`
 Q=`mktemp -d`
 ln -s "$P" $Q/dir
-cd $Q/dir/libatomic_ops-*[0-9]
+cd $Q/dir/libatomic_ops
 ./configure --prefix=$Q/dir/libatomic_ops-install
 $MAKE CC=$CC install
 cd /

diff --git a/configure_atomic_ops.sh b/configure_atomic_ops.sh
index 6a0e31a71093bc7db6617f75c49c12c26245c1a0..932579f147d982e63beb305bbbee0362bae2a6c6 100755 (executable)
--- a/configure_atomic_ops.sh
+++ b/configure_atomic_ops.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 P=`pwd`/libatomic_ops-install
-cd libatomic_ops-*[0-9]
+cd libatomic_ops
 ./configure --prefix=$P

diff --git a/gc.mak b/gc.mak
index 86ac2d3ca8d5c1706e9d78975dcafa1fb4f7f067..22ee90929ff7ea8633922a3733d3daff993075e3 100644 (file)
--- a/gc.mak
+++ b/gc.mak
@@ -5,7 +5,6 @@
 # TARGTYPE "Win32 (x86) Application" 0x0101
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-AO_VERSION=1.2
 !IF "$(CFG)" == ""
 CFG=gctest - Win32 Release
 !MESSAGE No configuration specified.  Defaulting to cord - Win32 Debug.
@@ -121,7 +120,7 @@ CPP=cl.exe
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D\
  "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" \
  /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" \
- /Ilibatomic_ops-$(AO_VERSION)/src /YX /Fo"$(INTDIR)/" /c 
+ /Ilibatomic_ops/src /YX /Fo"$(INTDIR)/" /c 
 CPP_OBJS=.\Release/
 CPP_SBRS=.\Release/
 
@@ -309,7 +308,7 @@ CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG"\
  /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" \
  /D "GC_ASSERTIONS" /D "GC_THREADS" \
  /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /YX /Fo"$(INTDIR)/"\
- /Ilibatomic_ops-$(AO_VERSION)/src /Fd"$(INTDIR)/" /c 
+ /Ilibatomic_ops/src /Fd"$(INTDIR)/" /c 
 CPP_OBJS=.\Debug/
 CPP_SBRS=.\Debug/
 
@@ -444,7 +443,7 @@ CPP=cl.exe
 # ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /YX /c
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
  "ALL_INTERIOR_POINTERS" /D "GC_THREADS" \
- /Ilibatomic_ops-$(AO_VERSION)/src /Fp"$(INTDIR)/gctest.pch" \
+ /Ilibatomic_ops/src /Fp"$(INTDIR)/gctest.pch" \
  /YX /Fo"$(INTDIR)/" /c 
 CPP_OBJS=.\gctest\Release/
 CPP_SBRS=.\.
@@ -531,7 +530,7 @@ CPP=cl.exe
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR /YX /c
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS"\
  /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR"$(INTDIR)/"\
- /Ilibatomic_ops-$(AO_VERSION)/src /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+ /Ilibatomic_ops/src /Fp"$(INTDIR)/gctest.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
 CPP_OBJS=.\gctest\Debug/
 CPP_SBRS=.\gctest\Debug/
 
@@ -621,7 +620,7 @@ CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
 CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\
- /Ilibatomic_ops-$(AO_VERSION)/src "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c 
+ /Ilibatomic_ops/src "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX /Fo"$(INTDIR)/" /c 
 CPP_OBJS=.\cord\Release/
 CPP_SBRS=.\.
 
@@ -714,7 +713,7 @@ CPP=cl.exe
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /YX /c
 CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I include /D "_DEBUG" /D "WIN32" /D\
  "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /Fp"$(INTDIR)/cord.pch" /YX\
- /Ilibatomic_ops-$(AO_VERSION)/src /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
+ /Ilibatomic_ops/src /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
 CPP_OBJS=.\cord\Debug/
 CPP_SBRS=.\.