Update package Makefiles to compile CgRPC with Swift Package Manager

Packages/CgRPC/Makefile

@@ -1,21 +1,7 @@
-SRCDIR = Sources
-SHAREDLIB = libCgRPC.so
 
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-        SHAREDLIBPATH = /usr/lib
-endif
-ifeq ($(UNAME_S),Darwin)
-        SHAREDLIBPATH = /usr/local/lib
-endif
-
-gRPC_Core: $(SRCDIR)/byte_buffer.c $(SRCDIR)/call.c $(SRCDIR)/channel.c $(SRCDIR)/completion_queue.c $(SRCDIR)/event.c $(SRCDIR)/handler.c $(SRCDIR)/internal.c $(SRCDIR)/metadata.c $(SRCDIR)/mutex.c $(SRCDIR)/observers.c $(SRCDIR)/server.c $(SRCDIR)/operations.c
-	clang -I../../third_party/grpc/include -shared -fPIC -o $(SHAREDLIB) $(SRCDIR)/byte_buffer.c $(SRCDIR)/call.c $(SRCDIR)/channel.c $(SRCDIR)/completion_queue.c $(SRCDIR)/event.c $(SRCDIR)/handler.c $(SRCDIR)/internal.c $(SRCDIR)/metadata.c $(SRCDIR)/mutex.c $(SRCDIR)/observers.c $(SRCDIR)/server.c $(SRCDIR)/operations.c -lgrpc -L../../third_party/grpc/libs/opt
-	cp $(SHAREDLIB) $(SHAREDLIBPATH)
+all: 
 	git init ; git add . ; git commit -m "Commit" ; git tag 1.0.0
 
 clean:
-	-rm -f $(SHAREDLIB)
-	-rm -f $(SHAREDLIBPATH)/$(SHAREDLIB)
 	-rm -rf .git
 

Packages/CgRPC/module.modulemap

@@ -1,7 +0,0 @@
-module CgRPC {
-  header "Sources/cgrpc.h"
-  link "CgRPC"
-  link "grpc"
-  export *
-}
-

Packages/Client/Makefile

@@ -1,8 +1,21 @@
 TARGET=Client
+
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Darwin)
+LIBDIR = ../../third_party/grpc/libs/opt
+INCDIR = ../../third_party/grpc/include
+endif
+
+ifeq ($(UNAME), Linux)
+LIBDIR = /usr/local/lib
+INCDIR = /usr/local/include
+endif
+
 all:
-	swift build -Xlinker -L/usr/local/lib
+	swift build -Xlinker -L../../third_party/grpc/libs/opt -Xlinker -lgrpc -Xcc -I../../third_party/grpc/include/ 
 
-install:
+install: all
 	cp .build/debug/$(TARGET) .
 
 clean :

Packages/Makefile

@@ -2,13 +2,15 @@
 demo: 	
 	cd CgRPC; make clean; make; cd ..
 	cd gRPC; make clean; make; cd ..
-	cd Server; make clean; make; make; make install; cd ..
-	cd Client; make clean; make; make; make install; cd ..
-	cd QuickProto; make clean; make; make; make install; cd ..
-	cd EchoServer; make clean; make; make; make install; cd ..
-	cd EchoClient; make clean; make; make; make install; cd ..
-	EchoServer/EchoServer &
-	EchoClient/EchoClient 
+	cd Server; make clean; make; make install; cd ..
+	cd Client; make clean; make; make install; cd ..
+	Server/Server &
+	Client/Client 
+	#cd QuickProto; make clean; make; make install; cd ..
+	#cd EchoServer; make clean; make; make install; cd ..
+	#cd EchoClient; make clean; make; make install; cd ..
+	#EchoServer/EchoServer &
+	#EchoClient/EchoClient 
 
 clean:  
 	cd CgRPC; make clean; cd ..

Packages/Server/Makefile

@@ -1,8 +1,21 @@
 TARGET=Server
+
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Darwin)
+LIBDIR = ../../third_party/grpc/libs/opt
+INCDIR = ../../third_party/grpc/include
+endif
+
+ifeq ($(UNAME), Linux)
+LIBDIR = /usr/local/lib
+INCDIR = /usr/local/include
+endif
+
 all:
-	swift build -Xlinker -L/usr/local/lib
+	swift build -Xlinker -L../../third_party/grpc/libs/opt -Xlinker -lgrpc -Xcc -I../../third_party/grpc/include/ 
 
-install:
+install: all
 	cp .build/debug/$(TARGET) .
 
 clean :

Packages/gRPC/Makefile

@@ -1,8 +1,5 @@
 all:
-	swift build -Xswiftc -D -Xswiftc SWIFT_PACKAGE
 	git init ; git add . ; git commit -m "Commit" ; git tag 1.0.0
 
 clean:
-	rm -rf .build
 	rm -rf .git
-	rm -rf Packages