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/iftop/patches/05.Makefile.in.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 306 9da68c8821e3
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
306
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     1
 
--- Makefile.in.orig	Tue Feb 10 13:54:06 2009
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     2
 
+++ Makefile.in	Fri Jan 16 12:42:53 2009
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -99,7 +99,7 @@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
 iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
                  options.c resolver.c screenfilter.c serv_hash.c \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
 
                  sorted_list.c threadprof.c ui.c util.c \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
-		 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+		 addrs_ioctl.c addrs_dlpi.c \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
 		 stringmap.c cfgfile.c vector.c
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
@@ -106,7 +106,7 @@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
 noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
                  integers.h ip.h llc.h ns_hash.h options.h resolver.h \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
                  screenfilter.h serv_hash.h sll.h sorted_list.h tcp.h \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
-                 threadprof.h token.h ui.h dlcommon.h stringmap.h \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
 
+                 threadprof.h token.h ui.h stringmap.h \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
 		 vector.h cfgfile.h ppp.h
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
@@ -134,7 +134,7 @@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    22
 
 	resolver.$(OBJEXT) screenfilter.$(OBJEXT) serv_hash.$(OBJEXT) \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    23
 
 	sorted_list.$(OBJEXT) threadprof.$(OBJEXT) ui.$(OBJEXT) \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    24
 
 	util.$(OBJEXT) addrs_ioctl.$(OBJEXT) addrs_dlpi.$(OBJEXT) \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    25
 
-	dlcommon.$(OBJEXT) stringmap.$(OBJEXT) cfgfile.$(OBJEXT) \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    26
 
+	stringmap.$(OBJEXT) cfgfile.$(OBJEXT) \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    27
 
 	vector.$(OBJEXT)
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    28
 
 iftop_OBJECTS = $(am_iftop_OBJECTS)
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    29
 
 iftop_LDADD = $(LDADD)
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    30
 
@@ -151,7 +151,7 @@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    31
 
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addr_hash.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    32
 
 @AMDEP_TRUE@	./$(DEPDIR)/addrs_dlpi.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    33
 
 @AMDEP_TRUE@	./$(DEPDIR)/addrs_ioctl.Po ./$(DEPDIR)/cfgfile.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    34
 
-@AMDEP_TRUE@	./$(DEPDIR)/dlcommon.Po ./$(DEPDIR)/edline.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    35
 
+@AMDEP_TRUE@	./$(DEPDIR)/edline.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    36
 
 @AMDEP_TRUE@	./$(DEPDIR)/hash.Po ./$(DEPDIR)/iftop.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    37
 
 @AMDEP_TRUE@	./$(DEPDIR)/ns_hash.Po ./$(DEPDIR)/options.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    38
 
 @AMDEP_TRUE@	./$(DEPDIR)/resolver.Po ./$(DEPDIR)/screenfilter.Po \
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    39
 
@@ -257,7 +257,6 @@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    40
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addrs_dlpi.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    41
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addrs_ioctl.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    42
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgfile.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    43
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlcommon.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    44
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edline.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    45
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
9da68c8821e3 7055089 move iftop/pv to userland
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    46
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iftop.Po@am__quote@
upstream/oracle/userland-gate