diff options
author | Karl Berry <karl@freefriends.org> | 2016-02-07 00:27:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-02-07 00:27:20 +0000 |
commit | 0f5e19a268f4d86c2897f590563f21c8277c18d1 (patch) | |
tree | 7e65891f29ccde62ed60cbcc94e7fb7631429ac2 /Build/source/utils/asymptote/Makefile.in | |
parent | 1b8f7f1bf982c75d77d85ac6855d48332cd41ca4 (diff) |
asy 2.36 sources
git-svn-id: svn://tug.org/texlive/trunk@39610 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/Makefile.in')
-rw-r--r-- | Build/source/utils/asymptote/Makefile.in | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in index eaedacec812..ad71223a110 100644 --- a/Build/source/utils/asymptote/Makefile.in +++ b/Build/source/utils/asymptote/Makefile.in @@ -12,6 +12,9 @@ GCPPLIB = @GCPPLIB@ GCLIBS = $(GCPPLIB) $(GCLIB) LFLAGS = @LDFLAGS@ LIBS = $(LFLAGS) @PTHREAD_LIBS@ @LIBS@ $(GCLIBS) +DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -s -static + +PERL = perl # Libraries needed to make asymptote.so. # We have to remove OpenGL, threading, GC, etc from this. @@ -20,7 +23,8 @@ SHAREDLIBS = $(filter-out -lGL -lGLU -lglut -pthread $(GCLIBS), $(LIBS)) vpath %.cc prc CAMP = camperror path drawpath drawlabel picture psfile texfile util settings \ - guide flatguide knot drawfill path3 drawpath3 drawsurface pen pipestream + guide flatguide knot drawfill path3 drawpath3 drawsurface \ + beziertriangle pen pipestream RUNTIME_FILES = runtime runbacktrace runpicture runlabel runhistory runarray \ runfile runsystem runpair runtriple runpath runpath3d runstring \ @@ -46,7 +50,7 @@ DIST = camp.tab.h camp.tab.cc lex.yy.cc runtime.cc keywords.cc \ allsymbols.h opsymbols.h $(SYMBOL_FILES:=.symbols.h) NAME = asy XNAME = x$(NAME) -CLEAN = camp.output svnrevision.cc base/version.asy doc/version.texi \ +CLEAN = camp.output base/version.asy doc/version.texi \ GUI/xasyVersion.py $(XNAME) doc/asy-latex.pdf EXTRA = asy-mode.el asy-init.el asy.vim asy_filetype.vim asy-kate.sh \ asymptote.py reload.js nopapersize.ps @@ -89,46 +93,45 @@ animationsdir = $(exampledir)/animations latexdir = $(DESTDIR)@latexdir@ contextdir = $(DESTDIR)@contextdir@ INSTALL = @INSTALL@ -REVISION = "const char *SVN_REVISION=" -last = `cat svnrevision.cc | sed -e 's/.*\"\(.*\)\";/\\1/'` +REVISION = "const char *REVISION=" +last = $(shell cat revision.cc | sed -e 's/.*\"\(.*\)\";/\\1/') +usinggit = $(shell if test -d ".git"; then echo yes; fi) +ifeq ($(usinggit),yes) + revision = $(shell LC_ALL="C" git describe | sed -e 's/-g.*//') +else + revision = $(shell grep AC_INIT configure.ac | cut -s -d[ -f3 | cut -s -d] -f1) +endif export prefix docdir exampledir mandir infodir INSTALL MAKE DESTDIR TEXI2DVI asy: version if test -n "$(MSDOS)"; then \ - $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) svnrevision.o asy.o $(LIBS) -s -static; \ + $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o asy.o $(DOSLIBS); \ else \ ln -sf GUI/xasy.py $(XNAME); \ - $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) svnrevision.o $(LIBS); \ + $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o $(LIBS); \ fi version: $(GCLIB) $(FILES:=.o) - $(eval revision := "") - if test "$(findstring svn,@PACKAGE_VERSION@)" = "svn"; then \ - $(eval revision := `LC_ALL="C" svn info 2>/dev/null | grep 'Revision' | sed -e 's/Revision: \(.*\)/-r\1/'`) \ - 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; \ + if test ! -e revision.cc -o "$(revision)" != "$(last)"; then \ + echo $(REVISION)\"$(revision)\"\; > revision.cc; \ fi + $(CXX) $(OPTS) $(INCL) -o revision.o -c revision.cc; - echo string VERSION=\"@VERSION@$(revision)\"\; > base/version.asy - echo @set VERSION @VERSION@$(revision) > doc/version.texi + echo string VERSION=\"$(revision)\"\; > base/version.asy + echo @set VERSION $(revision) > doc/version.texi echo @set Datadir @datadir@ >> doc/version.texi echo "#!/usr/bin/env python" > GUI/xasyVersion.py - echo xasyVersion = \"@VERSION@$(revision)\" >> GUI/xasyVersion.py + echo xasyVersion = \"$(revision)\" >> GUI/xasyVersion.py if test -n "$(MSDOS)"; then \ - cat asy.rc | sed -e "s/ASYMPTOTE_VERSION/@VERSION@$(revision)/" | \ + cat asy.rc | sed -e "s/ASYMPTOTE_VERSION/$(revision)/" | \ windres -o asy.o; \ fi asymptote.so: $(COREFILES:=.pic.o) - $(CXX) $(OPTS) -shared -o asymptote.so svnrevision.o $(COREFILES:=.pic.o) $(SHAREDLIBS) + $(CXX) $(OPTS) -shared -o asymptote.so revision.o $(COREFILES:=.pic.o) $(SHAREDLIBS) all: asy sty man faq asy-keywords.el @@ -177,17 +180,17 @@ faq: asy sty cd doc && $(MAKE) faq $(RUNTIME_FILES:=.cc): %.cc: runtime.pl opsymbols.h runtimebase.in %.in - perl ./runtime.pl $(@:.cc=) + $(PERL) ./runtime.pl $(@:.cc=) $(SYMBOL_FILES:=.symbols.h): %.symbols.h: findsym.pl %.cc $(CXX) -E -DNOSYM $(OPTS) $(INCL) $(@:.symbols.h=.cc) | \ - perl ./findsym.pl $@ - + $(PERL) ./findsym.pl $@ - $(SYMBOL_FILES:=.o): %.o: %.symbols.h allsymbols.h: findsym.pl $(SYMBOL_FILES:=.cc) $(CXX) -E -DNOSYM $(OPTS) $(INCL) $(SYMBOL_FILES:=.cc) | \ - perl ./findsym.pl $@ - + $(PERL) ./findsym.pl $@ - symbol.o: opsymbols.h allsymbols.h @@ -202,10 +205,10 @@ lex.yy.cc: camp.l lex.yy.d: $(GCLIB) lex.yy.cc camp.tab.h keywords.cc: keywords.pl camp.l process.cc - perl ./keywords.pl + $(PERL) ./keywords.pl opsymbols.h: opsymbols.pl camp.l - perl ./opsymbols.pl + $(PERL) ./opsymbols.pl envcompleter.d: keywords.cc @@ -214,7 +217,7 @@ asy-keywords.el: asy $(ASY) -l > asy.list ls $(addsuffix /*.asy,$(KEYWORDS)) | grep -v plain\* | \ grep -v three_\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list - perl ./asy-list.pl asy.list @VERSION@ + $(PERL) ./asy-list.pl asy.list $(revision) install: asy-keywords.el install-texhash install-man |