[packages/net-snmp.git] / net-snmp-link.patch

--- net-snmp-5.4.1/agent/Makefile.in.orig	2007-07-05 01:26:56.000000000 +0200
+++ net-snmp-5.4.1/agent/Makefile.in	2007-09-08 16:50:07.310018380 +0200
@@ -74,8 +74,8 @@
 #
 # how to build it info
 #
-USELIBS		= ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-HELPERLIB	= helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS		= $(top_builddir)/snmplib/libnetsnmp.la
+HELPERLIB	= $(top_builddir)/agent/helpers/libnetsnmphelpers.la
 AGENTLIB	= libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
 MIBLIB		= libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
 
@@ -143,11 +143,11 @@
 
 
 libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} $(USELIBS)
-	$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
+	$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
 	$(RANLIB) $(AGENTLIB)
 
 libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
-	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
+	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
 	$(RANLIB) $(MIBLIB)
 
 agentlib: $(AGENTLIB)
--- net-snmp-5.4.1/Makefile.rules.orig	2007-07-07 01:39:10.000000000 +0200
+++ net-snmp-5.4.1/Makefile.rules	2007-09-08 16:43:38.055836050 +0200
@@ -8,7 +8,7 @@
 
 # the standard items to build: libraries, bins, and sbins
 STANDARDTARGETS     =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
 
 standardall: subdirs $(STANDARDTARGETS)
 
@@ -187,17 +187,11 @@
 		$(LIB_LDCONFIG_CMD) ; \
 	fi
 
-installucdlibs: $(INSTALLUCDLIBS)
-	@if test "$(INSTALLUCDLIBS)" != ""; then \
-		it="$(INSTALLUCDLIBS)" ; \
-		$(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
-		$(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \
-		for i in $$it ; do \
-			echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
-			$(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
-		done ; \
-		$(LIB_LDCONFIG_CMD) ; \
-	fi
+installucdlibs:
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
+	ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
+	ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
+	ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
 
 installsubdirlibs:
 	@if test "$(SUBDIRS)" != ""; then \
--- net-snmp-5.4.1/snmplib/Makefile.in.orig	2007-06-18 23:34:43.000000000 +0200
+++ net-snmp-5.4.1/snmplib/Makefile.in	2007-09-08 16:48:42.425181069 +0200
@@ -128,7 +128,6 @@
 
 # libraries
 INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
 
 #
 # Things to build
@@ -191,10 +190,6 @@
 	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
 	$(RANLIB) $@
 
-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
-	$(RANLIB) $@
-
 #
 # internal test objects
 #
--- net-snmp-5.5/snmplib/Makefile.in~	2010-06-05 20:17:39.941541617 +0200
+++ net-snmp-5.5/snmplib/Makefile.in	2010-06-06 09:25:54.332457357 +0200
@@ -194,7 +194,7 @@
 
 # how to build the libraries.
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
+	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
 	$(RANLIB) $@
 
 #
Commit	Line	Data
13da4243 JB	1	--- net-snmp-5.4.1/agent/Makefile.in.orig 2007-07-05 01:26:56.000000000 +0200
	2	+++ net-snmp-5.4.1/agent/Makefile.in 2007-09-08 16:50:07.310018380 +0200
	3	@@ -74,8 +74,8 @@
f548e789 AM	4	#
	5	# how to build it info
	6	#
	7	-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	8	-HELPERLIB = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
	9	+USELIBS = $(top_builddir)/snmplib/libnetsnmp.la
	10	+HELPERLIB = $(top_builddir)/agent/helpers/libnetsnmphelpers.la
13da4243 JB	11	AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
13da4243 JB	12	MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
40bc0036	13
13da4243	14	@@ -143,11 +143,11 @@
edf6eebd	15
edf6eebd	16
13da4243 JB	17	libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
	18	- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
	19	+ $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
	20	$(RANLIB) $(AGENTLIB)
bf8b8ba8	21
13da4243	22	libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
849c236b	23	- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
13da4243 JB	24	+ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
	25	$(RANLIB) $(MIBLIB)
	26
	27	agentlib: $(AGENTLIB)
	28	--- net-snmp-5.4.1/Makefile.rules.orig 2007-07-07 01:39:10.000000000 +0200
	29	+++ net-snmp-5.4.1/Makefile.rules 2007-09-08 16:43:38.055836050 +0200
40bc0036 JB	30	@@ -8,7 +8,7 @@
	31
	32	# the standard items to build: libraries, bins, and sbins
	33	STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
13da4243 JB	34	-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
13da4243 JB	35	+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
40bc0036 JB	36
	37	standardall: subdirs $(STANDARDTARGETS)
	38
13da4243	39	@@ -187,17 +187,11 @@
40bc0036 JB	40	$(LIB_LDCONFIG_CMD) ; \
	41	fi
	42
	43	-installucdlibs: $(INSTALLUCDLIBS)
	44	- @if test "$(INSTALLUCDLIBS)" != ""; then \
	45	- it="$(INSTALLUCDLIBS)" ; \
	46	- $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
834a380a	47	- $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \
	48	- for i in $$it ; do \
	49	- echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
	50	- $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
	51	- done ; \
40bc0036 JB	52	- $(LIB_LDCONFIG_CMD) ; \
	53	- fi
	54	+installucdlibs:
	55	+ $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
	56	+ ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
	57	+ ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
	58	+ ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
	59
	60	installsubdirlibs:
	61	@if test "$(SUBDIRS)" != ""; then \
13da4243 JB	62	--- net-snmp-5.4.1/snmplib/Makefile.in.orig 2007-06-18 23:34:43.000000000 +0200
13da4243 JB	63	+++ net-snmp-5.4.1/snmplib/Makefile.in 2007-09-08 16:48:42.425181069 +0200
f548e789	64	@@ -128,7 +128,6 @@
40bc0036	65
04ea07b9 AM	66	# libraries
	67	INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	68	-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
40bc0036	69
04ea07b9 AM	70	#
04ea07b9 AM	71	# Things to build
13da4243 JB	72	@@ -191,10 +190,6 @@
	73	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
	74	$(RANLIB) $@
04ea07b9	75
13da4243 JB	76	-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
	77	- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
	78	- $(RANLIB) $@
04ea07b9 AM	79	-
	80	#
	81	# internal test objects
	82	#
c05d0e2e AM	83	--- net-snmp-5.5/snmplib/Makefile.in~ 2010-06-05 20:17:39.941541617 +0200
	84	+++ net-snmp-5.5/snmplib/Makefile.in 2010-06-06 09:25:54.332457357 +0200
	85	@@ -194,7 +194,7 @@
	86
	87	# how to build the libraries.
	88	libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
	89	- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
	90	+ $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
	91	$(RANLIB) $@
	92
	93	#