From 8a78f8f2d9c29afb6b94db0e81bfc4dec19ba41e Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 Mar 2020 16:48:05 +0000 Subject: [PATCH 1/8] 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 From ac26065687cb8397c178bd23c0087e39feed6213 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 Mar 2020 16:58:04 +0000 Subject: [PATCH 2/8] "make clean" works, and "make all" compiles, but does not link FossilOrigin-Name: af35b490ebb2140d9f70dc52549ad5e6b4747267d37f18a56e26a2a5f26499d7 --- src/wtp/Makefile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/wtp/Makefile b/src/wtp/Makefile index c42ad440..f234b1f3 100644 --- a/src/wtp/Makefile +++ b/src/wtp/Makefile @@ -6,6 +6,7 @@ #include ../Macros.mak +INCL_DIRS=-I../ LIBDIR := ../../lib LIBARCHDIR := $(LIBDIR)/$(ARCH) @@ -32,12 +33,15 @@ LIBS+=$(OPENSSL_LIBS) #SRC=$(wildcard *.c) OBJS=\ - wtp_main.o\ - discovery.o\ + wtp_main.o\ + discovery.o\ join.o\ configure.o\ run.o\ - changestate.o + changestate.o\ + + + #OBJS=$(patsubst %.c,%.o,$(SRC)) #OBJS:=$(patsubst %.o,$(OBJDIR)/%.o,$(OBJS)) @@ -46,11 +50,12 @@ ALL=$(EXENAME) all: $(ALL) +#$(OBJDIR)/%.o:%.c -$(OBJDIR)/%.o:%.c - @mkdir -p $(OBJDIR) +.c.o: +# @mkdir -p $(OBJDIR) @echo " $(CC) "$< - @$(CC) -c $(CFLAGS) $< -o $@ + @$(CC) $(INCL_DIRS) -c $(CFLAGS) $< -o $@ $(EXENAME): $(OBJS) echo " $(LD) $(EXENAME)" @@ -58,8 +63,9 @@ $(EXENAME): $(OBJS) clean: + rm -f *.o # rm $(OBJDIR)/* - rm $(EXENAME) + rm -f $(EXENAME) deps: echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend From 463e3c7f99059b3f9af8525816330c26373e26c6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Mar 2020 10:49:22 +0000 Subject: [PATCH 3/8] Deleted file FossilOrigin-Name: 7c19da05c164208d6b8e818a558c67e3fad35ab2d7ac232ec406cbc24f384b5a --- libcw.project | 395 -------------------------------------------------- 1 file changed, 395 deletions(-) delete mode 100644 libcw.project diff --git a/libcw.project b/libcw.project deleted file mode 100644 index 7a1bce2d..00000000 --- a/libcw.project +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make clean && make - make clean - make - - - - None - $(WorkspacePath)/src/cw/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make clean - make - - - - None - $(WorkspacePath) - - - - - - - - - - - - - - From aa8d835f62fec13d875d7d5e9ee67d987d13aa60 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Mar 2020 10:53:58 +0000 Subject: [PATCH 4/8] compiles and links with bsdmake FossilOrigin-Name: 00758ad2d00d5976c267e1fe8fc4b3dd9316eb820fd60bcc7e1372d282768597 --- src/ac/Makefile | 96 ++++++++++--------------------------------------- 1 file changed, 19 insertions(+), 77 deletions(-) diff --git a/src/ac/Makefile b/src/ac/Makefile index d0d51c2b..f0197545 100644 --- a/src/ac/Makefile +++ b/src/ac/Makefile @@ -1,56 +1,5 @@ -include ../Defs.mak -include ../Config.mak -include ../ACConfig.mak --include ../Config.local.mak --include ../ACConfig.local.mak -include ../Macros.mak - - -LIBARCHDIR=../../lib/$(ARCH) -INCL= -I/usr/local/include -I../ -LDFLAGS+=-L$(LIBARCHDIR) -#CFLAGS += -W -g -O0 -D_REENTRANT -DIPV6 $(INCL) -I../ -DSYS_ARCH=\"${ARCH}\" - -CFLAGS+=-DSYS_ARCH=\"$(ARCH)\" - -LIBS+=-lcw -LIBS+=-lrt -LIBS+=-lpthread -LIBS+=-lconfuse -LIBS+=-lsqlite3 -#LIBS+=-ldl - - -ifeq ($(SSL_LIBRARY),GNUTLS) -CFLAGS+=-DWITH_GNUTLS -CFLAGS+=$(GNUTLS_CFLAGS) -LIBS+=$(GNUTLS_LIBS) -LDFLAGS+=$(GNUTLS_LDFLAGS) -endif - -ifeq ($(SSL_LIBRARY),OPENSSL) -CFLAGS+=-DWITH_OPENSSL -CFLAGS+=$(OPESSL_CFLAGS) -LDFLAGS+=$(OPENSSL_LDFLAGS) -LIBS+=$(OPENSSL_LIBS) -endif - -CFLAGS += -DWITH_CW_LOG -CFLAGS += -DWITH_CW_LOG_DEBUG - -CFLAGS += -DWITH_RMAC_SUPPORT -CFLAGS += -DWITH_DTLS -CFLAGS += -DWITH_IPV6 -#CFLAGS += -DWITH_LWAPP - -RM = /bin/rm -f - -#AC_MODULES = mod_cipwap.o - - -# list of generated object files for AC. -AC_OBJS = \ +OBJS = \ wtplist.o wtpman.o conf.o ac_main.o \ dataman.o \ ac_interface.o \ @@ -59,41 +8,34 @@ AC_OBJS = \ ac_global.o \ discovery_cache.o\ shell.o\ - ${AC_MODULES} + +ARCH != uname -m +PRG=actube +LIBPATH=-L../../lib/$(ARCH)/ -L/usr/local/lib -L/usr/lib +LIBS+=-lcw +LIBS+=-lrt +LIBS+=-lpthread +LIBS+=-lconfuse +LIBS+=-lsqlite3 +LIBS+=-lc -AC_SRCS = $(AC_OBJS:.o=.c) -AC_DEPS := $(AC_OBJS:.o=.d) +INCL_DIRS=-I../ -I/usr/local/include -I./ +#FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX" +FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH='"$(ARCH)"' -AC_NAME = actube - -.PHONY: deps clean clean_libs libs - -# top-level rule, to compile everything. -all: $(AC_NAME) - -%.o:%.c +.c.o: @echo " $(CC) "$< - @$(CC) -c $(CFLAGS) $< -o $@ + $(CC) $(FLAGS) $(INCL_DIRS) -c $(CFLAGS) $< -o $@ -$(AC_NAME): $(AC_OBJS) +$(PRG): $(OBJS) # $(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS) - $(LD) $(AC_OBJS) -o $(AC_NAME) $(LDFLAGS) $(LIBS) + $(CC) $(LIBS) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS) clean: - $(RM) $(AC_NAME) $(AC_OBJS) $(AC_DEPS) - -clean_deps: - $(AC_DEPS) - -deps: - echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > .depend -# makedepend $(AC_SRC) -f.depend -p$(OBJDIR)/ - makedepend *.c -f.depend + rm -f $(PRG) $(OBJS) --include .depend - From 1b0bc5b6e2e3c27511683b3814c55752fa61e2ca Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2020 20:31:36 +0000 Subject: [PATCH 5/8] Config.mak for BSD make FossilOrigin-Name: e33ac54dbbef3a73e80a81880751ad093270f70f2bd20239e17a151e07dd7a0b --- src/Config.mak | 10 +++++++++- src/ac/Makefile | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Config.mak b/src/Config.mak index 4378ba2a..c00f2fc5 100644 --- a/src/Config.mak +++ b/src/Config.mak @@ -1,8 +1,16 @@ # # OpenSSL definitions # + + OPENSSL_VERSION=openssl-1.0.1i -USE_CONTRIB_OPENSSL=1 +OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl +OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ + +#OPENSSL_CFLAGS= +#OPENSSL_LIBS=-lssl -lcrypto #-ldl + + # GnuTLS definitions # GNUTLS_VERSION=3.3.9 diff --git a/src/ac/Makefile b/src/ac/Makefile index f0197545..e7991c4e 100644 --- a/src/ac/Makefile +++ b/src/ac/Makefile @@ -1,3 +1,4 @@ +include ../Config.mak OBJS = \ wtplist.o wtpman.o conf.o ac_main.o \ @@ -20,6 +21,8 @@ LIBS+=-lpthread LIBS+=-lconfuse LIBS+=-lsqlite3 LIBS+=-lc +LIBS+=$(OPENSSL_LIBS) + INCL_DIRS=-I../ -I/usr/local/include -I./ #FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX" From b9c64bcf9fe0e998c06d08e4c10dba0d9761b9ea Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2020 20:33:21 +0000 Subject: [PATCH 6/8] Renamed to example.mak FossilOrigin-Name: 551f41132479e604dc22c3f19be6f39993199560851a402714173ab73eb1c15c --- src/{Config.mak => Config.example.mak} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{Config.mak => Config.example.mak} (100%) diff --git a/src/Config.mak b/src/Config.example.mak similarity index 100% rename from src/Config.mak rename to src/Config.example.mak From 305f6eea2e1a18b86785d13a6d19eac3cca9fc0c Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2020 20:40:57 +0000 Subject: [PATCH 7/8] Switched to Config.default.mak FossilOrigin-Name: b80a347bd1c5aca770fa0135f30bbaa33c9f22eabac7424f5ee10c818ca1228e --- src/{Config.example.mak => Config.default.mak} | 10 +++++----- src/ac/Makefile | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) rename src/{Config.example.mak => Config.default.mak} (70%) diff --git a/src/Config.example.mak b/src/Config.default.mak similarity index 70% rename from src/Config.example.mak rename to src/Config.default.mak index c00f2fc5..3b9c1999 100644 --- a/src/Config.example.mak +++ b/src/Config.default.mak @@ -3,12 +3,12 @@ # -OPENSSL_VERSION=openssl-1.0.1i -OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl -OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ +#OPENSSL_VERSION=openssl-1.0.1i +#OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl +#OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ -#OPENSSL_CFLAGS= -#OPENSSL_LIBS=-lssl -lcrypto #-ldl +OPENSSL_LIBS=-lssl -lcrypto #-ldl +OPENSSL_CFLAGS= diff --git a/src/ac/Makefile b/src/ac/Makefile index e7991c4e..9363cd08 100644 --- a/src/ac/Makefile +++ b/src/ac/Makefile @@ -1,4 +1,5 @@ -include ../Config.mak +include ../Config.default.mak +-include ../Config.mak OBJS = \ wtplist.o wtpman.o conf.o ac_main.o \ From 9a80d871d7e3a3692d80fba1c9e446323fa93b8c Mon Sep 17 00:00:00 2001 From: root Date: Wed, 11 Mar 2020 21:58:47 +0000 Subject: [PATCH 8/8] Defaults Config.mak FossilOrigin-Name: b56f6b52c799cf164192068e3dbb2e38f31836dcd31f699344084aa1fedcc8f4 --- src/Config.default.mak | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Config.default.mak b/src/Config.default.mak index 3b9c1999..d977a035 100644 --- a/src/Config.default.mak +++ b/src/Config.default.mak @@ -1,8 +1,8 @@ # # OpenSSL definitions +# Chose either the contrib version or the system installed version # - #OPENSSL_VERSION=openssl-1.0.1i #OPENSSL_LIBS=../contrib/${OPENSSL_VERSION}/libssl.a ../contrib/${OPENSSL_VERSION}/libcrypto.a -ldl #OPENSSL_CFLAGS=../contrib/${OPENSSL_VERSION}/include/ @@ -17,17 +17,11 @@ OPENSSL_CFLAGS= USE_CONTRIB_GNUTLS=0 -# Compiler to use -# CC=clang -# CC=mips-openwrt-linux-uclibc-gcc -# LD=mips-openwrt-linux-uclibc-ld -# AR=mips-openwrt-linux-uclibc-ar -# CC=clang COMPDEFS=-DWITH_CW_LOG COMPDEFS+=-DWITH_CW_LOG_DEBUG - +# # LIBCW settings # WITH_GNUTLS @@ -35,7 +29,9 @@ COMPDEFS+=-DWITH_CW_LOG_DEBUG # WITH_GNUTLS=1 +# # Compile in openssl support +# WITH_OPENSSL=1 # @@ -46,4 +42,6 @@ OPTFLAGS := -g -O0 #CFLAGS := -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE=1 -pedantic -std=c99 -Wall -SSL_LIBRARY:=GNUTLS + + +