From ecdf859b6ce481abfd530425dcf6f0f764bd0001 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 28 Dec 2021 03:01:00 +0000 Subject: CTAN sync 202112280300 --- graphics/asymptote/Makefile.in | 63 +++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 19 deletions(-) (limited to 'graphics/asymptote/Makefile.in') diff --git a/graphics/asymptote/Makefile.in b/graphics/asymptote/Makefile.in index a6705f9536..467b4ccb0b 100644 --- a/graphics/asymptote/Makefile.in +++ b/graphics/asymptote/Makefile.in @@ -11,11 +11,15 @@ GCOPTIONS = @GCOPTIONS@ GCLIB = @GCLIB@ GCPPLIB = @GCPPLIB@ GCLIBS = $(GCPPLIB) $(GCLIB) -LFLAGS = @LDFLAGS@ -LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) +LFLAGS = @LDFLAGS@ -LLspCpp +LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) @LSPLIBS@ DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static -PERL = perl +PERL ?= perl +PYTHON ?= python3 +BISON ?= bison +PYRCC ?= pyrcc5 +PYUIC ?= pyuic5 # Libraries needed to make asymptote.so. # We have to remove OpenGL, threading, GC, etc from this. @@ -44,32 +48,41 @@ 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 shaders jsfile + $(PRC) glrender tr shaders jsfile v3dfile tinyexr EXRFiles GLTextures \ + lspserv symbolmaps FILES = $(COREFILES) main SYMBOLSH = opsymbols.h allsymbols.h $(SYMBOL_FILES:=.symbols.h) UIFILES = $(wildcard GUI/windows/*.ui) PYFILES = $(wildcard GUI/pyUIClass/*.py) GUI/icons_rc.py + +GENERATEDENUMS=v3dtypes v3dheadertypes +ASYGENERATEDENUMS=$(addprefix base/,$(GENERATEDENUMS:=.asy)) +PYGENERATEDENUMS=$(GENERATEDENUMS:=.py) + DIST = camp.tab.h camp.tab.cc lex.yy.cc runtime.cc keywords.cc \ asy-keywords.el $(RUNTIME_FILES:=.cc) $(RUNTIME_FILES:=.h) asy.list \ - $(SYMBOLSH) $(PYFILES) + $(SYMBOLSH) $(PYFILES) $(GENERATEDENUMS:=.h) $(ASYGENERATEDENUMS) + NAME = asy XNAME = x$(NAME) CLEAN = camp.output base/version.asy doc/version.texi \ - GUI/xasyVersion.py $(XNAME) doc/asy-latex.pdf $(SYMBOLSH) + GUI/xasyVersion.py GUI/icons_rc.py $(XNAME) doc/asy-latex.pdf \ + $(SYMBOLSH) EXTRA = asy-mode.el asy-init.el asy.vim asy_filetype.vim asy-kate.sh \ asymptote.py reload.js nopapersize.ps EXEXTRA = piicon.png 100d.pdb1 *.views *.dat *.bib DOCEXTRA = *.asy *.csv *.dat latexusage.tex externalprc.tex pixel.pdf KEYWORDS = base $(ASYMPTOTE_SITEDIR) -LATEXFILES = asymptote.sty asycolors.sty ocg.sty latexmkrc +LATEXFILES = asymptote.sty asycolors.sty latexmkrc CONTEXTFILES = colo-asy.tex ASY = ./asy -dir base -config "" -render=0 -DEFS = @DEFS@ @OPTIONS@ @PTHREAD_CFLAGS@ -DFFTWPP_SINGLE_THREAD +DEFS = @DEFS@ @OPTIONS@ @PTHREAD_CFLAGS@ -DFFTWPP_SINGLE_THREAD -Wall CFLAGS = @CFLAGS@ -OPTS = $(DEFS) @CPPFLAGS@ @CXXFLAGS@ $(CFLAGS) +OPTS = $(DEFS) @CPPFLAGS@ @CXXFLAGS@ $(CFLAGS) -ILspCpp -ILspCpp/LibLsp/JsonRpc + GLEWOPTS = $(DEFS) @CPPFLAGS@ $(CFLAGS) -DGLEW_NO_GLU -DGLEW_BUILD -O1 -fPIC # Options for compiling the object files for the shared library. @@ -78,12 +91,9 @@ GLEWOPTS = $(DEFS) @CPPFLAGS@ $(CFLAGS) -DGLEW_NO_GLU -DGLEW_BUILD -O1 -fPIC # shared library. SHAREDOPTS = $(filter-out -DUSEGC, $(OPTS)) -fPIC -DFOR_SHARED -CXX = @CXX@ -Wall -CC = @CC@ -Wall -MAKEDEPEND = $(OPTS) -O0 -M -DDEPEND -BISON ?= bison -PYRCC ?= pyrcc5 -PYUIC ?= pyuic5 +CXX = @CXX@ +CC = @CC@ +MAKEDEPEND = $(OPTS) -O0 -M -MG -DDEPEND LEX = @LEX@ prefix = @prefix@ @@ -115,7 +125,7 @@ endif export prefix docdir exampledir mandir infodir INSTALL MAKE DESTDIR TEXI2DVI -asy: version glew.o +asy: version glew.o @LSPLIB@ if test -n "$(MSDOS)"; then \ $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o asy.o $(DOSLIBS); \ else \ @@ -123,7 +133,7 @@ asy: version glew.o $(CXX) $(OPTS) -o $(NAME) $(FILES:=.o) revision.o $(LIBS); \ fi -version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py +version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py $(ASYGENERATEDENUMS) $(PYGENERATEDENUMS) if test ! -s revision.cc || test "$(revision)" != "$(last)"; then \ echo $(REVISION)\"$(revision)\"\; > revision.cc; \ echo const char *AsyGLVersion=\"$(ASYGLVERSION)\"\; >> revision.cc; \ @@ -149,6 +159,9 @@ version: $(GCLIB) $(FILES:=.o) $(notdir $(UIFILES:.ui=.py)) GUI/icons_rc.py asymptote.so: $(COREFILES:=.pic.o) glew.o $(CXX) $(OPTS) -shared -o asymptote.so revision.o $(COREFILES:=.pic.o) $(SHAREDLIBS) +liblspcpp.a: + cd LspCpp && $(MAKE) CPPFLAGS="@OPTIONS@" + all: asy sty man faq asy-keywords.el $(GCLIB): $(GC).tar.gz @@ -324,6 +337,7 @@ uninstall-docdir: clean: FORCE -rm -f asy asymptote.so *.pic.o *.o *.d *mon.out $(CLEAN) + cd LspCpp && $(MAKE) clean gc-clean: FORCE clean -if test -d $(GC); then \ @@ -361,9 +375,9 @@ glew.o: glew.c GL/glew.h GL/glew.c config.h $(CC) -I. $(GLEWOPTS) -o glew.o -c glew.c .SUFFIXES: .c .cc .o .d .ui .py -%.o: %.cc +%.o: %.cc $(GENERATEDENUMS:=.h) $(CXX) $(OPTS) -o $@ -c $< -%.d: %.cc +%.d: %.cc $(GENERATEDENUMS:=.h) $(GCLIB) @echo Creating $@; \ rm -f $@; \ ${CXX} $(MAKEDEPEND) $(MDOPTS) $< > $@.$$$$ 2>/dev/null && \ @@ -383,6 +397,17 @@ glew.o: glew.c GL/glew.h GL/glew.c config.h %.pic.o: %.cc $(CXX) $(SHAREDOPTS) -o $@ -c $< +# Generate V3D headers + +%.h: %.csv generate_enums.py $(GENERATEDENUMS:=.csv) + $(PYTHON) generate_enums.py -language cxx -o $@ -i $< -name $(notdir $*) -xopt namespace=camp + +base/%.asy: %.csv generate_enums.py $(GENERATEDENUMS:=.csv) + $(PYTHON) generate_enums.py -language asy -o $@ -i $< -name $(notdir $*) + +%.py: %.csv generate_enums.py $(GENERATEDENUMS:=.csv) + $(PYTHON) generate_enums.py -language python -o $@ -i $< -name $(notdir $*) + ifeq (,$(findstring clean,${MAKECMDGOALS})) -include $(FILES:=.d) endif -- cgit v1.2.3