Skip to content

Commit

Permalink
move src/Makefil.common -> /.common.mk
Browse files Browse the repository at this point in the history
  • Loading branch information
mtzguido committed Apr 4, 2020
1 parent a51813a commit e31b8b4
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all package clean boot 0 1 2 3 hints bench

include src/Makefile.common
include .common.mk

all:
$(Q)+$(MAKE) -C src/ocaml-output
Expand Down
2 changes: 1 addition & 1 deletion examples/Makefile.common
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FSTAR_HOME?=..
include $(FSTAR_HOME)/ulib/gmake/z3.mk
include $(FSTAR_HOME)/ulib/gmake/fstar.mk
include $(FSTAR_HOME)/src/Makefile.common
include $(FSTAR_HOME)/.common.mk
FSTAR=$(FSTAR_HOME)/bin/fstar.exe

#################################################################################
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FSTAR_HOME=..
include Makefile.common
include $(FSTAR_HOME)/.common.mk
include $(FSTAR_HOME)/ulib/gmake/z3.mk # This pins $(Z3) ...
include $(FSTAR_HOME)/ulib/gmake/fstar.mk # and $(FSTAR) for all sub-make calls

Expand Down
2 changes: 1 addition & 1 deletion src/ocaml-output/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ else
HAS_VALID_MENHIR := 0
endif
include ../Makefile.common
include ../../.common.mk
MENHIR=menhir #--explain --infer -la 1 --table
OCAMLLEX=ocamllex
Expand Down
2 changes: 1 addition & 1 deletion ulib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extra: .cache
mkdir -p .cache

include $(FSTAR_HOME)/ulib/ml/Makefile.include
include $(FSTAR_HOME)/src/Makefile.common
include $(FSTAR_HOME)/.common.mk

fstarlib.mgen: *.fst *.fsti
mkdir -p ml/extracted
Expand Down
2 changes: 1 addition & 1 deletion ulib/Makefile.verify
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ CACHE_DIR=--cache_dir .cache --hint_dir .cache

OTHERFLAGS+=$(USE_EXTRACTED_INTERFACES)

include $(FSTAR_HOME)/src/Makefile.common
include $(FSTAR_HOME)/.common.mk
include gmake/z3.mk
include gmake/fstar.mk
include gmake/Makefile.tmpl
Expand Down

0 comments on commit e31b8b4

Please sign in to comment.