--- Makefile.in.orig 2023-01-10 18:01:14.000000000 +0800 +++ Makefile.in 2023-06-22 15:00:50.000000000 +0800 @@ -18,21 +18,19 @@ DISTFILES = INSTALL LICENSE NEWS README Makefile Makefile.in \ config.guess config.status config.h.in config.sub configure \ - configure.in install-sh libwired man run thirdparty wired -SUBDIRS = libwired + configure.in install-sh man run thirdparty wired WIREDOBJS = $(addprefix $(objdir)/wired/,$(notdir $(patsubst %.c,%.o,$(shell find $(abs_top_srcdir)/wired -name "[a-z]*.c")))) NATPMPOBJS = $(addprefix $(objdir)/natpmp/,$(notdir $(patsubst %.c,%.o,$(shell find $(abs_top_srcdir)/thirdparty/natpmp -name "[a-z]*.c")))) -MINIUPNPCOBJS = $(addprefix $(objdir)/miniupnpc/,$(notdir $(patsubst %.c,%.o,$(shell find $(abs_top_srcdir)/thirdparty/miniupnpc -name "[a-z]*.c")))) TRANSFERTESTOBJS = $(addprefix $(objdir)/transfertest/,$(notdir $(patsubst %.c,%.o,$(shell find $(abs_top_srcdir)/test/transfertest -name "[a-z]*.c")))) DEFS = @DEFS@ -DENABLE_STRNATPMPERR -DMINIUPNPC_SET_SOCKET_TIMEOUT CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ -LDFLAGS = -L$(rundir)/libwired/lib @LDFLAGS@ -LIBS = -lwired @LIBS@ -INCLUDES = -I$(abs_top_srcdir) -I$(rundir)/libwired/include -I$(abs_top_srcdir)/thirdparty +LDFLAGS = -L__PREFIX__/libexec/openssl10/lib -lssl -L__PREFIX__/lib -lncurses -lminiupnpc @LDFLAGS@ __PREFIX__/lib/libwired.a ${prefix}/lib/libiconv.dylib +LIBS = -L__PREFIX__/libexec/openssl10/lib -lssl -L__PREFIX__/lib -lncurses -lminiupnpc @LIBS@ __PREFIX__/lib/libwired.a ${prefix}/lib/libiconv.dylib +INCLUDES = -I$(abs_top_srcdir) -I__PREFIX__/include/wired -I$(abs_top_srcdir)/thirdparty INSTALL = @INSTALL@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -68,9 +66,9 @@ (cd $$subdir && $(MAKE) -e $$target) || exit 1; \ done -$(rundir)/wired: $(WIREDOBJS) $(NATPMPOBJS) $(MINIUPNPCOBJS) $(rundir)/libwired/lib/libwired.a +$(rundir)/wired: $(WIREDOBJS) $(NATPMPOBJS) @test -d $(@D) || mkdir -p $(@D) - $(LINK) $(WIREDOBJS) $(NATPMPOBJS) $(MINIUPNPCOBJS) $(LIBS) + $(LINK) $(WIREDOBJS) $(NATPMPOBJS) $(LIBS) $(rundir)/wiredctl: $(abs_top_srcdir)/wired/wiredctl.in @test -d $(@D) || mkdir -p $(@D) @@ -81,7 +79,7 @@ @test -d $(@D) || mkdir -p $(@D) sed -e 's,@WD_USER\@,$(WD_USER),g' -e 's,@WD_GROUP\@,$(WD_GROUP),g' $< > $@ -$(rundir)/transfertest: $(TRANSFERTESTOBJS) $(rundir)/libwired/lib/libwired.a +$(rundir)/transfertest: $(TRANSFERTESTOBJS) @test -d $(@D) || mkdir -p $(@D) $(LINK) $(TRANSFERTESTOBJS) $(LIBS) @@ -101,14 +99,6 @@ @test -d $(@D) || mkdir -p $(@D) ($(DEPEND) $< | sed 's,$*.o,$(@D)/&,g'; echo "$@: $<") > $@ -$(objdir)/miniupnpc/%.o: $(abs_top_srcdir)/thirdparty/miniupnpc/%.c - @test -d $(@D) || mkdir -p $(@D) - $(COMPILE) -I$( $@ - $(objdir)/transfertest/%.o: $(abs_top_srcdir)/test/transfertest/%.c @test -d $(@D) || mkdir -p $(@D) $(COMPILE) -I$(