Skip to content

Commit

Permalink
some fixes to makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
mtzguido committed Mar 31, 2020
1 parent aa320a1 commit c2f2e58
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -42,9 +42,9 @@ boot:

# Regenerate all hints for the standard library and regression test suite
hints:
$(Q)OTHERFLAGS=--record_hints +$(MAKE) -C ulib/
$(Q)OTHERFLAGS=--record_hints +$(MAKE) -C ulib/ml
$(Q)OTHERFLAGS=--record_hints +$(MAKE) -C src/ uregressions
+$(Q)OTHERFLAGS=--record_hints $(MAKE) -C ulib/
+$(Q)OTHERFLAGS=--record_hints $(MAKE) -C ulib/ml
+$(Q)OTHERFLAGS=--record_hints $(MAKE) -C src/ uregressions

bench:
./bin/run_benchmark.sh
2 changes: 1 addition & 1 deletion examples/dependencies/Makefile
Expand Up @@ -14,7 +14,7 @@ FSTAR = $(FSTAR_HOME)/bin/fstar.exe $(FSTAR_FLAGS)
.PHONY: all test clean

all:
rm -f .depend && +$(MAKE) .depend
rm -f .depend && $(MAKE) .depend
+$(MAKE) test

# 1. Extract .ml files
Expand Down
10 changes: 5 additions & 5 deletions ucontrib/CoreCrypto/ml/Makefile
Expand Up @@ -64,17 +64,17 @@ openssl_stub.o: libcrypto.a openssl_stub.c
$(OCAMLOPT) -c $<

$(PLATFORM)/platform.cmx: $(PLATFORM)/platform.ml
+$(MAKE) -C $(PLATFORM)
$(MAKE) -C $(PLATFORM)

$(DB)/DB.cmx: $(DB)/DB.ml
+$(MAKE) -C $(DB)
$(MAKE) -C $(DB)

openssl/Configure:
echo "openssl folder is empty, running git submodule update... no recursion"
git submodule update --init

openssl/libcrypto.a: openssl/Configure
cd openssl && $(OPENSSL_CONF) && +$(MAKE) build_libs
cd openssl && $(OPENSSL_CONF) && $(MAKE) build_libs

libcrypto.a: openssl/libcrypto.a
cp openssl/libcrypto.a .
Expand All @@ -96,8 +96,8 @@ test: Tests.exe
@$(EXTRA_PATH) ./Tests.exe

clean:
+$(MAKE) -C $(DB) clean
+$(MAKE) -C $(PLATFORM) clean
$(MAKE) -C $(DB) clean
$(MAKE) -C $(PLATFORM) clean
rm -f Tests.exe *.[oa] *.so *.cm[ixoa] *.cmxa *.exe *.dll *.annot *~

depend:
Expand Down
14 changes: 7 additions & 7 deletions ucontrib/CoreCrypto/ml/pki/Makefile
Expand Up @@ -137,10 +137,10 @@ clean:

# --------------------------------------------------------------------
define pki
+$(MAKE) MODE=$(1) clean
+$(MAKE) MODE=$(1) dh dsap ca
+$(MAKE) MODE=$(1) '$(1)/certificates/$(1).cert.mitls.org.p12'
+$(MAKE) MODE=$(1) hash
$(MAKE) MODE=$(1) clean
$(MAKE) MODE=$(1) dh dsap ca
$(MAKE) MODE=$(1) '$(1)/certificates/$(1).cert.mitls.org.p12'
$(MAKE) MODE=$(1) hash
endef

pki.built:
Expand All @@ -150,7 +150,7 @@ pki.built:
touch $@

pki.clean:
+$(MAKE) MODE=rsa clean
+$(MAKE) MODE=dsa clean
+$(MAKE) MODE=ecdsa clean
$(MAKE) MODE=rsa clean
$(MAKE) MODE=dsa clean
$(MAKE) MODE=ecdsa clean
rm pki.built

0 comments on commit c2f2e58

Please sign in to comment.