Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/net-snmp/patches/011.Makefile.in.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Sat, 18 May 2013 09:18:20 -0700
changeset 1306 11b376b53ac1
parent 1301 636f7c363f41
child 1650 ce501c11d5fa
permissions -rw-r--r--
backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     1
 
Only in net-snmp-5.4.1.mod: .patches.011.Makefile.in.patch
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     2
 
diff -ru net-snmp-5.4.1/agent/Makefile.in net-snmp-5.4.1.mod/agent/Makefile.in
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     3
 
--- net-snmp-5.4.1/agent/Makefile.in	2007-07-05 04:56:56.000000000 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     4
 
+++ net-snmp-5.4.1.mod/agent/Makefile.in	2009-06-24 06:08:28.858891018 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     5
 
@@ -120,8 +120,11 @@
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     6
 
 OBJS		= $(LIBAGENTOBJS)  $(AGENTOBJS)  mib_modules.o  auto_nlist.o
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
     7
 
 LOBJS		= $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
     8
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
     9
 
+LIB_LD_ADD_AGENT	=-lnetsnmp -lnetsnmphelpers
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    10
 
+
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    11
 
+LIB_LD_ADD_PATH_MIBS	=-Lhelpers -L../snmplib
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    12
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    13
 
-all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    14
 
+all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    15
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    16
 
 #
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    17
 
 # build stuff targets
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    18
 
@@ -152,6 +155,10 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    19
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    20
 
 agentlib: $(AGENTLIB)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    21
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    22
 
+relinklib:     ${LLIBAGENTOBJS} $(USELIBS)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    23
 
+	$(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    24
 
+	$(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    25
 
+
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    26
 
 miblib: $(MIBLIB)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    27
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    28
 
 libs: $(INSTALLLIBS)
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    29
 
Only in net-snmp-5.4.1.mod/agent: Makefile.in~
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    30
 
diff -ru net-snmp-5.4.1/agent/helpers/Makefile.in net-snmp-5.4.1.mod/agent/helpers/Makefile.in
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    31
 
--- net-snmp-5.4.1/agent/helpers/Makefile.in	2007-06-27 03:15:20.000000000 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    32
 
+++ net-snmp-5.4.1.mod/agent/helpers/Makefile.in	2009-06-24 06:01:35.912702710 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    33
 
@@ -137,8 +137,11 @@
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    34
 
 	table_tdata.lo \
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    35
 
 	watcher.lo
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    36
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    37
 
+LIB_LD_ADD	=-lnetsnmp
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    38
 
+LIB_LD_ADD_PATH	=-L../../snmplib
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    39
 
+
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    40
 
 all: standardall
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    41
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    42
 
 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    43
 
-	$(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    44
 
-	$(RANLIB) $@
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    45
 
+	$(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    46
 
+	$(RANLIB) $@ $(LIB_LD_ADD)
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    47
 
diff -ru net-snmp-5.4.1/snmplib/Makefile.in net-snmp-5.4.1.mod/snmplib/Makefile.in
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    48
 
--- net-snmp-5.4.1/snmplib/Makefile.in	2007-06-19 03:04:43.000000000 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    49
 
+++ net-snmp-5.4.1.mod/snmplib/Makefile.in	2009-06-24 06:01:35.912972597 +0530
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    50
 
@@ -181,6 +181,9 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    51
 
 # just in case someone wants to remove libtool, change this to OBJS.
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    52
 
 TOBJS=$(LOBJS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    53
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    54
 
+# To satisfy -zdefs
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    55
 
+LIB_LD_ADD	=-lnsl -lsocket -L$(libdir)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    56
 
+
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    57
 
 #
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    58
 
 CPPFLAGS = $(TOP_INCLUDES) -I. 	$(SNMPLIB_INCLUDES) @CPPFLAGS@
1301
636f7c363f41 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents: 252
diff changeset 
    59
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    60
 
@@ -188,8 +191,8 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    61
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    62
 
 # how to build the libraries.
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    63
 
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    64
 
-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    65
 
-	$(RANLIB) $@
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    66
 
+	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD)
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    67
 
+	$(RANLIB) $@  $(LIB_LD_ADD)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    68
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    69
 
 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    70
 
 	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
upstream/oracle/userland-gate