From 521bdd26ba65ffbdfc9f564502979527117cfeda Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Fri, 14 Dec 2018 11:48:26 +0000
Subject: [PATCH] refactoring

---
 OAuth.AspNet.AuthServer/Makefile | 5 +++++
 Yavsc.Server/Makefile            | 8 +++++++-
 Yavsc/Makefile                   | 2 --
 dnx.mk                           | 6 ++----
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 OAuth.AspNet.AuthServer/Makefile

diff --git a/OAuth.AspNet.AuthServer/Makefile b/OAuth.AspNet.AuthServer/Makefile
new file mode 100644
index 00000000..060daddc
--- /dev/null
+++ b/OAuth.AspNet.AuthServer/Makefile
@@ -0,0 +1,5 @@
+include ../versioning.mk
+include ../dnx.mk
+
+all: $(BINTARGETPATH)
+
diff --git a/Yavsc.Server/Makefile b/Yavsc.Server/Makefile
index 856a4dfe..080f60f7 100644
--- a/Yavsc.Server/Makefile
+++ b/Yavsc.Server/Makefile
@@ -3,5 +3,11 @@ include ../dnx.mk
 
 all: $(BINTARGETPATH)
 
-bin/$(CONFIGURATION)/Yavsc.Server.dll: ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll
+$(BINTARGETPATH): ../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll ../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll 
+
+../OAuth.AspNet.AuthServer/bin/$(CONFIGURATION)/OAuth.AspNet.AuthServer.dll:
+	make -C ../OAuth.AspNet.AuthServer 
+
+../Yavsc.Abstract/bin/$(CONFIGURATION)/Yavsc.Abstract.dll:
+	make -C ../Yavsc.Abstract
 
diff --git a/Yavsc/Makefile b/Yavsc/Makefile
index d2c9e532..a2e727c4 100644
--- a/Yavsc/Makefile
+++ b/Yavsc/Makefile
@@ -20,8 +20,6 @@ else
 		@git status
 endif
 
-default: pushInPre
-
 publish:
 	ASPNET_ENV=$(ASPNET_ENV) dnu publish
 
diff --git a/dnx.mk b/dnx.mk
index 0d722734..2fc4be41 100644
--- a/dnx.mk
+++ b/dnx.mk
@@ -74,8 +74,6 @@ endif
 deploy-pkg: pack
 	@mv bin/$(PKGFILENAME) $(NUGETSOURCE)
 
-.PHONY: rc-num.txt-check $(BINTARGETPATH)
-
-.DEFAULT_GOAL :=
-
+.PHONY: rc-num.txt-check 
 
+.DEFAULT_GOAL := $(BINTARGETPATH)