projects / packages / net-snmp.git / blame
| Commit | Line | Data |
|---|---|---|
| 04ea07b9 AM |
1 | diff -ur net-snmp-5.3.org/agent/Makefile.in net-snmp-5.3/agent/Makefile.in |
| 2 | --- net-snmp-5.3.org/agent/Makefile.in 2005-12-04 19:24:25.000000000 +0100 | |
| 3 | +++ net-snmp-5.3/agent/Makefile.in 2006-01-09 00:58:58.598965000 +0100 | |
| 4 | @@ -133,7 +133,7 @@ | |
| 40bc0036 | 5 | |
| edf6eebd | 6 | |
| 04ea07b9 AM |
7 | libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} |
| 8 | - $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) | |
| 9 | + $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) | |
| 10 | $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) | |
| edf6eebd | 11 | |
| 04ea07b9 AM |
12 | libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} |
| 13 | diff -ur net-snmp-5.3.org/Makefile.rules net-snmp-5.3/Makefile.rules | |
| 14 | --- net-snmp-5.3.org/Makefile.rules 2005-10-10 20:47:48.000000000 +0200 | |
| 15 | +++ net-snmp-5.3/Makefile.rules 2006-01-09 00:58:13.044118000 +0100 | |
| 40bc0036 JB |
16 | @@ -8,7 +8,7 @@ |
| 17 | ||
| 18 | # the standard items to build: libraries, bins, and sbins | |
| 19 | STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
| 20 | -STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS) | |
| 21 | +STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) | |
| 22 | ||
| 23 | standardall: subdirs $(STANDARDTARGETS) | |
| 24 | ||
| 04ea07b9 | 25 | @@ -175,17 +175,11 @@ |
| 40bc0036 JB |
26 | $(LIB_LDCONFIG_CMD) ; \ |
| 27 | fi | |
| 28 | ||
| 29 | -installucdlibs: $(INSTALLUCDLIBS) | |
| 30 | - @if test "$(INSTALLUCDLIBS)" != ""; then \ | |
| 31 | - it="$(INSTALLUCDLIBS)" ; \ | |
| 32 | - $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
| 834a380a | 33 | - $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \ |
| 34 | - for i in $$it ; do \ | |
| 35 | - echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \ | |
| 36 | - $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \ | |
| 37 | - done ; \ | |
| 40bc0036 JB |
38 | - $(LIB_LDCONFIG_CMD) ; \ |
| 39 | - fi | |
| 40 | +installucdlibs: | |
| 41 | + $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \ | |
| 42 | + ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \ | |
| 43 | + ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \ | |
| 44 | + ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a | |
| 45 | ||
| 46 | installsubdirlibs: | |
| 47 | @if test "$(SUBDIRS)" != ""; then \ | |
| 04ea07b9 AM |
48 | diff -ur net-snmp-5.3.org/snmplib/Makefile.in net-snmp-5.3/snmplib/Makefile.in |
| 49 | --- net-snmp-5.3.org/snmplib/Makefile.in 2005-10-30 20:01:14.000000000 +0100 | |
| 50 | +++ net-snmp-5.3/snmplib/Makefile.in 2006-01-09 00:58:13.044118000 +0100 | |
| 51 | @@ -127,7 +127,6 @@ | |
| 40bc0036 | 52 | |
| 04ea07b9 AM |
53 | # libraries |
| 54 | INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
| 55 | -INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) | |
| 40bc0036 | 56 | |
| 04ea07b9 AM |
57 | # |
| 58 | # Things to build | |
| 59 | @@ -187,13 +186,9 @@ | |
| 40bc0036 | 60 | |
| 04ea07b9 AM |
61 | # how to build the libraries. |
| 62 | libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
| fdc083b5 AM |
63 | - $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
| 64 | + $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ | |
| 04ea07b9 AM |
65 | $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
| 66 | ||
| 67 | -libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} | |
| fdc083b5 | 68 | - $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@ |
| 04ea07b9 AM |
69 | - $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) |
| 70 | - | |
| 71 | # | |
| 72 | # internal test objects | |
| 73 | # |