diff options
| -rw-r--r-- | gnu.ocaml.obj.mk | 22 | ||||
| -rw-r--r-- | gnu.ocaml.rules.mk | 17 |
2 files changed, 22 insertions, 17 deletions
diff --git a/gnu.ocaml.obj.mk b/gnu.ocaml.obj.mk index 0933c11..1549c71 100644 --- a/gnu.ocaml.obj.mk +++ b/gnu.ocaml.obj.mk @@ -23,7 +23,7 @@ _MAXDEPTH= -maxdepth 1 endif ifdef EXCL -_EXL= $(foreach e, $(EXCL), -not -regex '.*$e.*') +_EXL= $(foreach e,$(EXCL),-not -regex '.*$e.*') endif MENHIR?= menhir @@ -37,7 +37,7 @@ _FND= find _PAT= '.*ml[ily]*.*' _SRC= $(shell $(_FND) $(_FNDFLAGS)) _ORD= $(CSRC) $(shell $(OCAMLDEP) $(_INC) -sort $(_SRC)) -_INC= $(foreach e, $(sort $(foreach e, $(_SRC), $(dir $e))), -I '$e') +_INC= $(foreach e,$(sort $(foreach e,$(_SRC),$(dir $e))),-I '$e') ifdef CSRC ifndef OCAMLNATIVE @@ -63,20 +63,20 @@ ifndef NOSUBDIR OCAMLFLAGS+= $(_INC) endif -_OBJ= $(patsubst %.c, %.o, $(filter %.c, $(_ORD))) +_OBJ= $(patsubst %.c,%.o,$(filter %.c,$(_ORD))) ifdef OCAMLNATIVE -_OBJ+= $(patsubst %.ml, %.cmx, $(filter %.ml, $(_ORD))) -_CLN+= $(patsubst %.cmx, %.o, $(filter %.cmx, $(_OBJ))) -_CLN+= $(patsubst %.cmx, %.cmi, $(filter %.cmx, $(_OBJ))) +_OBJ+= $(patsubst %.ml,%.cmx,$(filter %.ml,$(_ORD))) +_CLN+= $(patsubst %.cmx,%.o,$(filter %.cmx,$(_OBJ))) +_CLN+= $(patsubst %.cmx,%.cmi,$(filter %.cmx,$(_OBJ))) else -_OBJ+= $(patsubst %.ml, %.cmo, $(filter %.ml, $(_ORD))) -_CLN+= $(patsubst %.cmo, %.cmi, $(filter %.cmo, $(_OBJ))) +_OBJ+= $(patsubst %.ml,%.cmo,$(filter %.ml,$(_ORD))) +_CLN+= $(patsubst %.cmo,%.cmi,$(filter %.cmo,$(_OBJ))) endif -_INT= $(patsubst %.mly, %.ml, $(filter %.mly, $(_SRC))) -_INT+= $(patsubst %.mll, %.ml, $(filter %.mll, $(_SRC))) -_CLN+= $(patsubst %.ml, %.mli, $(_INT)) +_INT= $(patsubst %.mly,%.ml,$(filter %.mly,$(_SRC))) +_INT+= $(patsubst %.mll,%.ml,$(filter %.mll,$(_SRC))) +_CLN+= $(patsubst %.ml,%.mli,$(_INT)) -include $(_DEP) diff --git a/gnu.ocaml.rules.mk b/gnu.ocaml.rules.mk index 9e5e620..d227457 100644 --- a/gnu.ocaml.rules.mk +++ b/gnu.ocaml.rules.mk @@ -14,15 +14,20 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -%.o: %.c +%.o: %.c $(OCAMLC) -c -ccopt "$(CFLAGS) -o $@" $< -%.cmi: %.mli + +%.cmi: %.mli $(OCAMLC) $(OCAMLFLAGS) $< -%.cmo: %.ml + +%.cmo: %.ml $(OCAMLC) $(OCAMLFLAGS) -c $< -%.cmx: %.ml + +%.cmx: %.ml $(OCAMLC) $(OCAMLFLAGS) -c $< -%.ml: %.mll + +%.ml: %.mll $(OCAMLLEX) $(OCAMLLEXFLAGS) $< -%.ml: %.mly + +%.ml: %.mly $(MENHIR) $(MENHIRFLAGS) $< |