diff options
| author | pboutill | 2012-10-15 09:01:09 +0000 |
|---|---|---|
| committer | pboutill | 2012-10-15 09:01:09 +0000 |
| commit | 466b18682f85e79e698cfad47f43088b8c56f439 (patch) | |
| tree | 86b720d4db1dc386177630230770a56be0d33d73 | |
| parent | dfbeef579b729c01ad8737676c083c9491cf5676 (diff) | |
Makefiles: Only -I required dirs (config, lib, ide) when compiling coqide
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15887 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile.build | 12 | ||||
| -rw-r--r-- | Makefile.common | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Makefile.build b/Makefile.build index a59b8fa187..01c3e58505 100644 --- a/Makefile.build +++ b/Makefile.build @@ -303,7 +303,7 @@ plugins/micromega/csdpcert$(EXE): $(CSDPCERTCMO:.cmo=$(BESTOBJ)) # target to build CoqIde coqide:: coqide-files coqide-binaries theories/Init/Prelude.vo -COQIDEFLAGS=-thread $(COQIDEINCLUDES) +COQIDEFLAGS=-thread $(addprefix -I , $(IDESRCDIRS)) $(COQIDEINCLUDES) .SUFFIXES:.vo @@ -318,7 +318,7 @@ coqide-files: $(IDEFILES) ifeq ($(HASCOQIDE),opt) $(COQIDE): $(LINKIDEOPT) | $(COQTOPEXE) $(SHOW)'OCAMLOPT -o $@' - $(HIDE)$(OCAMLOPT) $(COQIDEFLAGS) $(MLINCLUDES) $(OPTFLAGS) -o $@ unix.cmxa threads.cmxa \ + $(HIDE)$(OCAMLOPT) $(COQIDEFLAGS) $(OPTFLAGS) -o $@ unix.cmxa threads.cmxa \ lablgtk.cmxa lablgtksourceview2.cmxa $(IDEOPTFLAGS) gtkThread.cmx \ str.cmxa $(LINKIDEOPT) $(STRIP) $@ @@ -329,7 +329,7 @@ endif $(COQIDEBYTE): $(LINKIDE) | $(COQTOPBYTE) $(SHOW)'OCAMLC -o $@' - $(HIDE)$(OCAMLC) $(COQIDEFLAGS) $(MLINCLUDES) $(BYTEFLAGS) -o $@ unix.cma threads.cma lablgtk.cma\ + $(HIDE)$(OCAMLC) $(COQIDEFLAGS) $(BYTEFLAGS) -o $@ unix.cma threads.cma lablgtk.cma\ lablgtksourceview2.cma gtkThread.cmo str.cma $(COQRUNBYTEFLAGS) $(LINKIDE) # install targets @@ -814,11 +814,13 @@ endif COND_BYTEFLAGS= \ $(if $(filter checker/%,$<), $(CHKLIBS), \ - $(if $(filter ide/%,$<),$(COQIDEFLAGS),) $(MLINCLUDES)) $(BYTEFLAGS) + $(if $(filter ide/%,$<), $(COQIDEFLAGS), \ + $(if $(filter tools/coq_makefile%,$<), -I ide,) $(MLINCLUDES))) $(BYTEFLAGS) COND_OPTFLAGS= \ $(if $(filter checker/%,$<), $(CHKLIBS), \ - $(if $(filter ide/%,$<),$(COQIDEFLAGS),) $(MLINCLUDES)) $(OPTFLAGS) + $(if $(filter ide/%,$<), $(COQIDEFLAGS), \ + $(if $(filter tools/coq_makefile%,$<), -I ide,) $(MLINCLUDES))) $(OPTFLAGS) %.o: %.c $(SHOW)'OCAMLC $<' diff --git a/Makefile.common b/Makefile.common index 8fa2e5b766..56253fc7b4 100644 --- a/Makefile.common +++ b/Makefile.common @@ -76,9 +76,12 @@ PLUGINS:=\ SRCDIRS:=\ $(CORESRCDIRS) \ - tools tools/coqdoc scripts ide/utils ide \ + tools tools/coqdoc scripts \ $(addprefix plugins/, $(PLUGINS)) +IDESRCDIRS:=\ + config lib ide/utils ide + # Order is relevent here because kernel and checker contain files # with the same name CHKSRCDIRS:= checker lib config kernel parsing @@ -224,8 +227,7 @@ IDEMOD:=$(shell cat ide/ide.mllib) # coqmktop, coqc -COQENVCMO:=lib/clib.cma\ - lib/loc.cmo lib/errors.cmo +COQENVCMO:=lib/clib.cma lib/loc.cmo lib/errors.cmo COQMKTOPCMO:=$(COQENVCMO) scripts/tolink.cmo scripts/coqmktop.cmo |