From 8a78f8f2d9c29afb6b94db0e81bfc4dec19ba41e Mon Sep 17 00:00:00 2001
From: root <root@noemail.net>
Date: Mon, 9 Mar 2020 16:48:05 +0000
Subject: [PATCH] Moving away from gnu make to standard make files

FossilOrigin-Name: 54da48386fd111829892b580e1746bc892ca3ddb6e17cff298dbed8878ddd9ec
---
 src/wtp/Makefile | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index c4d6f24f..c42ad440 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -1,9 +1,9 @@
-include ../Defs.mak
-include ../Config.mak
-include ../WtpConfig.mak
--include ../Config.local.mak
--include ../WtpConfig.local.mak
-include ../Macros.mak
+#include ../Defs.mak
+#include ../Config.mak
+#include ../WtpConfig.mak
+#-include ../Config.local.mak
+#-include ../WtpConfig.local.mak
+#include ../Macros.mak
 
 
 
@@ -16,26 +16,31 @@ LIBS		:= -lcw -lnettle
 #STATICLIBS	:= $(LIBDIR)/$(ARCH)/libcw.a
 LDFLAGS		+= -L$(LIBARCHDIR)
 
-ifeq ($(SSL_LIBRARY),GNUTLS)
-CFLAGS+=-DWITH_GNUTLS
-CFLAGS+=$(GNUTLS_CFLAGS)
-LIBS+=$(GNUTLS_LIBS)
-LDFLAGS+=$(GNUTLS_LDFLAGS)
-endif
+#ifeq ($(SSL_LIBRARY),GNUTLS)
+#CFLAGS+=-DWITH_GNUTLS
+#CFLAGS+=$(GNUTLS_CFLAGS)
+#LIBS+=$(GNUTLS_LIBS)
+#LDFLAGS+=$(GNUTLS_LDFLAGS)
+#endif
 
-ifeq ($(SSL_LIBRARY),OPENSSL)
+#ifeq ($(SSL_LIBRARY),OPENSSL)
 CFLAGS+=-DWITH_OPENSSL
 CFLAGS+=$(OPESSL_CFLAGS)
 LDFLAGS+=$(OPENSSL_LDFLAGS)
 LIBS+=$(OPENSSL_LIBS)
-endif
-
+#endif
 
 #SRC=$(wildcard *.c)
-SRC=wtp_main.c discovery.c join.c configure.c run.c changestate.c
+OBJS=\
+	wtp_main.o\
+	discovery.o\ 
+	join.o\
+	configure.o\
+	run.o\
+	changestate.o
 
-OBJS=$(patsubst %.c,%.o,$(SRC))
-OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))
+#OBJS=$(patsubst %.c,%.o,$(SRC))
+#OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS))
 
 ALL=$(EXENAME)
 
@@ -53,8 +58,8 @@ $(EXENAME): $(OBJS)
 
 
 clean: 
-	$(RM) $(OBJDIR)/*
-	$(RM) $(EXENAME)
+#	rm  $(OBJDIR)/*
+	rm  $(EXENAME)
 
 deps:  
 	echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend