diff options
author | Karl Berry <karl@freefriends.org> | 2014-04-27 22:38:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-04-27 22:38:18 +0000 |
commit | 55e45a0d588de0392d2198753e45d75cd58f9e4d (patch) | |
tree | 358fbf59150b403df32a1cdce8203a6a430df110 /Build/source/utils/asymptote/Makefile.in | |
parent | 7aca5de4dcd646af709f86123599cdcb45d6445f (diff) |
asy 2.26 sources
git-svn-id: svn://tug.org/texlive/trunk@33703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/Makefile.in')
-rw-r--r-- | Build/source/utils/asymptote/Makefile.in | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in index 28be5fcc2ba..30ad960255c 100644 --- a/Build/source/utils/asymptote/Makefile.in +++ b/Build/source/utils/asymptote/Makefile.in @@ -37,7 +37,7 @@ COREFILES = $(CAMP) $(SYMBOL_FILES) env genv stm dec errormsg \ fftw++asy simpson coder coenv impdatum \ @getopt@ locate parser program application varinit fundec refaccess \ envcompleter process constructor array Delaunay predicates \ - $(PRC) glrender tr arcball algebra3 quaternion svnrevision + $(PRC) glrender tr arcball algebra3 quaternion FILES = $(COREFILES) main @@ -99,17 +99,23 @@ asy: version GUIversion if test -n "$(MSDOS)"; then \ cat asy.rc | sed -e "s/ASYMPTOTE_VERSION/@VERSION@$(revision)/" | \ windres -o asy.o; \ - $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) asy.o $(LIBS) -s -static; \ + $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) svnrevision.o asy.o $(LIBS) -s -static; \ else \ ln -sf GUI/xasy.py $(XNAME); \ - $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) $(LIBS); \ + $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) svnrevision.o $(LIBS); \ fi version: $(GCLIB) $(FILES:=.o) - if test "$(revision)" != "$(last)"; then \ - echo $(REVISION)\"$(revision)\"\; > svnrevision.cc; \ + if test -r svnrevision; then \ + if test "$(revision)" != "$(last)"; then \ + echo $(REVISION)\"$(revision)\"\; > svnrevision.cc; \ + $(CXX) $(OPTS) $(INCL) -o svnrevision.o -c svnrevision.cc; \ + fi \ + else \ + echo $(REVISION)\"\"\; > svnrevision.cc; \ $(CXX) $(OPTS) $(INCL) -o svnrevision.o -c svnrevision.cc; \ fi + echo string VERSION=\"@VERSION@$(revision)\"\; > base/version.asy echo @set VERSION @VERSION@$(revision) > doc/version.texi echo @set Datadir @datadir@ >> doc/version.texi @@ -119,10 +125,7 @@ GUIversion: echo xasyVersion = \"@VERSION@$(revision)\" >> GUI/xasyVersion.py asymptote.so: $(COREFILES:=.pic.o) - $(CXX) $(OPTS) -shared -o asymptote.so $(COREFILES:=.pic.o) $(SHAREDLIBS) - -svnrevision.cc: - echo $(REVISION)\"\"\; > svnrevision.cc; + $(CXX) $(OPTS) -shared -o asymptote.so svnrevision.o $(COREFILES:=.pic.o) $(SHAREDLIBS) all: asy sty man faq asy-keywords.el @@ -130,7 +133,7 @@ $(GCLIB): $(GC).tar.gz gunzip -c $(GC).tar.gz > $(GC).tar tar -xf $(GC).tar rm -f $(GC).tar - if test -e $(LIBATOMIC).tar.gz; then \ + if test -r $(LIBATOMIC).tar.gz; then \ gunzip -c $(LIBATOMIC).tar.gz > $(LIBATOMIC).tar; \ tar -xf $(LIBATOMIC).tar; \ rm -f $(LIBATOMIC).tar; \ @@ -149,7 +152,7 @@ $(GCLIB): $(GC).tar.gz if test "$(GC)" = "gc-7.2d"; then \ mv gc-7.2 gc-7.2d; \ fi - cd $(GC); \ + cd $(GC) && \ ./configure $(GCOPTIONS); \ $(MAKE) check |