From bfa60b9288b7f1747b145768ba3c31ad783239a7 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Wed, 17 Aug 2022 20:30:03 +0200 Subject: [PATCH] Add Makefile based build process This commit updates the submodules to versions that contain a Makefile to automate their builds. A main Makefile has been added to orchestrate the builds. --- Makefile | 24 ++++++++++++++++++++++++ cacert_resources | 2 +- oidc_app | 2 +- oidc_idp | 2 +- oidc_registration | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5325275 --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +SUBDIRS = cacert_resources oidc_app oidc_idp oidc_registration + +all: oidc_app/demo-app oidc_idp/cacert-idp oidc_registration/cacert-oidc-registration + +oidc_app/demo-app: force_look + echo building demo app : $(MAKE) $(MFLAGS) + cd oidc_app ; $(MAKE) $(MFLAGS) + +oidc_idp/cacert-idp: force_look + echo building CAcert IDP : $(MAKE) $(MFLAGS) + cd oidc_idp ; $(MAKE) $(MFLAGS) + +oidc_registration/cacert-oidc-registration: force_look + echo building CAcert client registration: $(MAKE) $(MFLAGS) + cd oidc_registration ; $(MAKE) $(MFLAGS) + +clean: + echo cleaning up in . + -for d in $(SUBDIRS) ; do ( cd $$d; $(MAKE) clean ); done + +force_look: + true + +.PHONY: all clean diff --git a/cacert_resources b/cacert_resources index 5cbcbef..ad14916 160000 --- a/cacert_resources +++ b/cacert_resources @@ -1 +1 @@ -Subproject commit 5cbcbefac6f05fa6537b6a925cc29118a5ecc571 +Subproject commit ad14916ba5ca4e89b3f97b7d22be0321d35ae4f9 diff --git a/oidc_app b/oidc_app index c69e8d2..294f237 160000 --- a/oidc_app +++ b/oidc_app @@ -1 +1 @@ -Subproject commit c69e8d29805af1ad9abab2e6318f3b1c3b45a557 +Subproject commit 294f2372e1c6bcb65a614e498ff127d3e032345c diff --git a/oidc_idp b/oidc_idp index 26447f9..2affaa2 160000 --- a/oidc_idp +++ b/oidc_idp @@ -1 +1 @@ -Subproject commit 26447f99c92e346ca5823f84db8822e1988f726d +Subproject commit 2affaa21506db92731685bc3ab67679604147243 diff --git a/oidc_registration b/oidc_registration index 0c88fb5..be90065 160000 --- a/oidc_registration +++ b/oidc_registration @@ -1 +1 @@ -Subproject commit 0c88fb544734d07a2d61e87b9084ee6fdc274cff +Subproject commit be9006546dbad89aef476d2096c91b14fad2a3f4