From aa8d835f62fec13d875d7d5e9ee67d987d13aa60 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Mar 2020 10:53:58 +0000 Subject: [PATCH] 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 -