39 lines
1.4 KiB
Plaintext
39 lines
1.4 KiB
Plaintext
$NetBSD: patch-aa,v 1.3 2010/04/17 12:43:03 obache Exp $
|
|
|
|
--- client/Makefile.in.orig 2006-05-10 10:58:02.000000000 +0000
|
|
+++ client/Makefile.in
|
|
@@ -30,7 +30,7 @@ PROGRAMS= adnslogres adnsheloex adnshost
|
|
PROGRAMS_LOCAL= fanftest adnstest
|
|
PROGRAMS_ALL= $(PROGRAMS) $(PROGRAMS_LOCAL)
|
|
|
|
-STATIC_LIB= $(ADNSDIR)/libadns.a
|
|
+STATIC_LIB= $(ADNSDIR)/libadns.la
|
|
|
|
ifeq ($(ENABLE_DYNAMIC),elf)
|
|
DYNAMIC_DEP= $(srcdir)/../dynamic/$(SHLIBFILE)
|
|
@@ -60,13 +60,13 @@ all: $(TARGETS)
|
|
install: $(TARG_INSTALL)
|
|
mkdir -p $(bindir)
|
|
set -xe; for f in $(TARG_INSTALL); \
|
|
- do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
|
|
+ do ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
|
|
|
|
uninstall:
|
|
for f in $(TARGETS); do rm -f $(bindir)/$$f; done
|
|
|
|
adnshost: $(ADH_OBJS) $(DYNAMIC_DEP)
|
|
- $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
|
|
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)
|
|
|
|
adnshost_s: $(ADH_OBJS) $(STATIC_LIB)
|
|
$(CC) $(LDFLAGS) $(ADH_OBJS) $(STATIC_LIB) -o $@ $(LDLIBS)
|
|
@@ -76,7 +76,7 @@ $(ALL_OBJS): $(ADNSDIR)/adns.h $(ADNSDI
|
|
adnsresfilter.o: $(ADNSDIR)/tvarith.h
|
|
|
|
%: %.o $(DYNAMIC_DEP)
|
|
- $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
|
|
+ ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) $< $(DYNAMIC_LINK) -o $@ $(LDLIBS)
|
|
|
|
%_s: %.o $(STATIC_LIB)
|
|
$(CC) $(LDFLAGS) $< $(STATIC_LIB) -o $@ $(LDLIBS)
|