Client mostly complete

[subauth.git] / Makefile

diff --git a/Makefile b/Makefile
index fedb3daeca032b76178c324143971ed54b1f5fa8..d538520cd4dbcfdbb64c7e97e94d79a4414d4eb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,11 @@ include $(BUILDSYS)/Maketop
 EXTRA_RUNDIRS=run
 
 # Add the detected flags to all the global flags
-CFLAGS+=$(LIBUCW_CFLAGS)
-LIBS+=$(LIBUCW_LIBS)
+CFLAGS+=$(LIBUCW_CFLAGS) $(LIBUCW_JSON_CFLAGS)
+LIBS+=$(LIBUCW_LIBS) $(LIBUCW_JSON_LIBS)
 
-# Programs we want to compile
-PROGS+=$(o)/subauthd $(o)/subauth
-
-# And how they are created
-$(o)/subauthd: $(o)/subauthd.o $(LIBUCW)
-$(o)/subauth: $(o)/subauth.o $(LIBUCW)
-
-# Configuration files
-CONFIGS+=subauthd
+include $(s)/server/Makefile
+include $(s)/client/Makefile
 
 # And finally the default rules of the build system
 include $(BUILDSYS)/Makebottom