From e3a2a5d4fc3ad29462f2e4548c32ac00b4fbd05f Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Mon, 26 Nov 2018 15:04:09 +0100
Subject: Rename generated directory gramlib__pack -> gramlib/.pack

It's a bit cleaner this way, especially wrt the number of toplevel directories.

Also fix warning about undefined GRAMMARCMA while we're at it.
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 330562afb6..628ad35ca4 100644
--- a/Makefile
+++ b/Makefile
@@ -95,9 +95,9 @@ EXISTINGMLI := $(call find, '*.mli')
 
 GENMLGFILES:= $(MLGFILES:.mlg=.ml)
 # GRAMFILES must be in linking order
-export GRAMFILES=$(addprefix gramlib__pack/gramlib__,Ploc Plexing Gramext Grammar)
+export GRAMFILES=$(addprefix gramlib/.pack/gramlib__,Ploc Plexing Gramext Grammar)
 export GRAMMLFILES := $(addsuffix .ml, $(GRAMFILES)) $(addsuffix .mli, $(GRAMFILES))
-export GENGRAMFILES := $(GRAMMLFILES) gramlib__pack/gramlib.ml
+export GENGRAMFILES := $(GRAMMLFILES) gramlib/.pack/gramlib.ml
 export GENMLFILES:=$(LEXFILES:.mll=.ml) $(YACCFILES:.mly=.ml) $(GENMLGFILES)  ide/coqide_os_specific.ml kernel/copcodes.ml
 export GENHFILES:=kernel/byterun/coq_jumptbl.h
 export GENFILES:=$(GENMLFILES) $(GENMLIFILES) $(GENHFILES)
@@ -201,7 +201,7 @@ objclean: archclean indepclean
 
 .PHONY: gramlibclean
 gramlibclean:
-	rm -rf gramlib__pack/
+	rm -rf gramlib/.pack/
 
 cruftclean: mlgclean
 	find . \( -name '*~' -o -name '*.annot' \) -exec rm -f {} +
@@ -291,7 +291,7 @@ KNOWNML:=$(EXISTINGML) $(GENMLFILES) $(MLPACKFILES:.mlpack=.ml) \
  $(patsubst %.mlp,%.ml,$(wildcard grammar/*.mlp))
 KNOWNOBJS:=$(KNOWNML:.ml=.cmo) $(KNOWNML:.ml=.cmx) $(KNOWNML:.ml=.cmi) \
  $(MLIFILES:.mli=.cmi) \
- gramlib__pack/gramlib.cma gramlib__pack/gramlib.cmxa $(MLLIBFILES:.mllib=.cma) $(MLLIBFILES:.mllib=.cmxa) grammar/grammar.cma
+ gramlib/.pack/gramlib.cma gramlib/.pack/gramlib.cmxa $(MLLIBFILES:.mllib=.cma) $(MLLIBFILES:.mllib=.cmxa) grammar/grammar.cma
 ALIENOBJS:=$(filter-out $(KNOWNOBJS),$(EXISTINGOBJS))
 
 alienclean:
-- 
cgit v1.2.3