]>
Commit | Line | Data |
---|---|---|
40bc0036 JB |
1 | --- net-snmp-5.1.1/snmplib/Makefile.in.orig 2004-03-04 14:41:19.000000000 +0100 |
2 | +++ net-snmp-5.1.1/snmplib/Makefile.in 2004-03-27 16:13:21.978939688 +0100 | |
3 | @@ -115,7 +115,6 @@ | |
4 | ||
5 | # libraries | |
6 | INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
7 | -INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
8 | ||
9 | # | |
10 | # Things to build | |
11 | @@ -178,13 +177,9 @@ | |
edf6eebd JB |
12 | |
13 | # how to build the libraries. | |
14 | libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
15 | - $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} | |
16 | + $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -lcrypto | |
17 | $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
18 | ||
40bc0036 | 19 | -libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} |
edf6eebd | 20 | - $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} |
40bc0036 JB |
21 | - $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
22 | - | |
edf6eebd | 23 | # |
40bc0036 JB |
24 | # internal test objects |
25 | # | |
26 | --- net-snmp-5.1.1/Makefile.rules.orig 2004-02-13 23:42:28.000000000 +0100 | |
27 | +++ net-snmp-5.1.1/Makefile.rules 2004-03-27 16:15:57.294328160 +0100 | |
28 | @@ -8,7 +8,7 @@ | |
29 | ||
30 | # the standard items to build: libraries, bins, and sbins | |
31 | STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
32 | -STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS) | |
33 | +STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
34 | ||
35 | standardall: subdirs $(STANDARDTARGETS) | |
36 | ||
37 | @@ -161,17 +161,11 @@ | |
38 | $(LIB_LDCONFIG_CMD) ; \ | |
39 | fi | |
40 | ||
41 | -installucdlibs: $(INSTALLUCDLIBS) | |
42 | - @if test "$(INSTALLUCDLIBS)" != ""; then \ | |
43 | - it="$(INSTALLUCDLIBS)" ; \ | |
44 | - $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
834a380a | 45 | - $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \ |
46 | - for i in $$it ; do \ | |
47 | - echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \ | |
48 | - $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \ | |
49 | - done ; \ | |
40bc0036 JB |
50 | - $(LIB_LDCONFIG_CMD) ; \ |
51 | - fi | |
52 | +installucdlibs: | |
53 | + $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
54 | + ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \ | |
55 | + ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \ | |
56 | + ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a | |
57 | ||
58 | installsubdirlibs: | |
59 | @if test "$(SUBDIRS)" != ""; then \ | |
60 | --- net-snmp-5.1.1/agent/Makefile.in.orig 2003-10-14 15:30:48.000000000 +0200 | |
61 | +++ net-snmp-5.1.1/agent/Makefile.in 2004-03-27 16:24:52.646942192 +0100 | |
62 | @@ -120,7 +120,7 @@ | |
63 | ||
64 | ||
65 | libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) | |
66 | - $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) | |
67 | + $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) | |
68 | $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) | |
69 | ||
70 | libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} |