summaryrefslogtreecommitdiff
path: root/Makefile.direct
diff options
context:
space:
mode:
authorivmai <ivmai>2009-09-29 15:50:11 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:48 +0200
commit1de3109f677b5eb8a03d7d835b5ec798d5ded455 (patch)
tree833c627dd950bc2a1c61dea1a9ae70135d466352 /Makefile.direct
parent2d0671a27fe52b44aa54d24e1905765c071d4c9c (diff)
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.
Diffstat (limited to 'Makefile.direct')
-rw-r--r--Makefile.direct11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.direct b/Makefile.direct
index 3593091..4c7eac9 100644
--- 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