git.samba.org / obnox / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- Make --enable-static work again (configure.in, Makefile.am)
[obnox/wireshark/wip.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index df7508d0b7443cb018b832786ef00686899990d9..0bed5f41bc93a70c1002e4bcd19ff9779c79db16 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.586 2003/06/09 10:08:04 sahlberg Exp $
+# $Id: Makefile.am,v 1.622 2003/09/05 07:44:44 jmayer Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -112,6 +112,7 @@ DISSECTOR_SRC = \
        packet-cdp.c   \
        packet-cgmp.c  \
        packet-chdlc.c  \
+       packet-cisco-oui.c \
        packet-clearcase.c  \
        packet-clip.c  \
        packet-clnp.c  \
@@ -142,6 +143,7 @@ DISSECTOR_SRC = \
        packet-dcerpc-lsa.c \
        packet-dcerpc-lsa-ds.c \
        packet-dcerpc-mapi.c  \
+       packet-dcerpc-messenger.c  \
        packet-dcerpc-mgmt.c  \
        packet-dcerpc-ndr.c  \
        packet-dcerpc-netlogon.c \
@@ -182,8 +184,11 @@ DISSECTOR_SRC = \
        packet-dvmrp.c \
        packet-eap.c \
        packet-eapol.c \
+       packet-echo.c \
+       packet-edonkey.c \
        packet-eigrp.c \
        packet-enc.c    \
+       packet-enip.c   \
        packet-esis.c  \
        packet-eth.c   \
        packet-etherip.c        \
@@ -207,12 +212,16 @@ DISSECTOR_SRC = \
        packet-giop.c  \
        packet-gmrp.c \
        packet-gnutella.c \
+       packet-gprs-ns.c \
        packet-gre.c   \
        packet-gssapi.c \
        packet-gtp.c   \
        packet-gvrp.c  \
        packet-h1.c    \
+       packet-h225.c  \
+       packet-h245.c  \
        packet-h261.c  \
+       packet-h263.c  \
        packet-hclnfsd.c  \
        packet-hpext.c \
        packet-hsrp.c  \
@@ -234,6 +243,7 @@ DISSECTOR_SRC = \
        packet-ipmi.c  \
        packet-ipp.c   \
        packet-ipsec.c \
+       packet-ipsec-udp.c \
        packet-ipv6.c  \
        packet-ipx.c   \
        packet-ipxwan.c \
@@ -250,6 +260,7 @@ DISSECTOR_SRC = \
        packet-isns.c \
        packet-isup.c  \
        packet-iua.c   \
+       packet-jabber.c \
        packet-kadm5.c \
        packet-kerberos.c \
        packet-klm.c   \
@@ -257,12 +268,14 @@ DISSECTOR_SRC = \
        packet-lapb.c  \
        packet-lapbether.c \
        packet-lapd.c  \
+       packet-laplink.c  \
        packet-ldap.c  \
        packet-ldp.c   \
        packet-llc.c   \
        packet-lmi.c   \
        packet-lmp.c   \
        packet-lpd.c   \
+       packet-lwapp.c \
        packet-m2pa.c  \
        packet-m2tp.c  \
        packet-m2ua.c  \
@@ -299,6 +312,8 @@ DISSECTOR_SRC = \
        packet-nlm.c   \
        packet-nlsp.c  \
        packet-nntp.c  \
+       packet-nt-oui.c \
+       packet-nt-sonmp.c \
        packet-ntlmssp.c  \
        packet-ntp.c  \
        packet-null.c  \
@@ -306,6 +321,7 @@ DISSECTOR_SRC = \
        packet-osi-options.c \
        packet-ospf.c  \
        packet-pcnfsd.c \
+       packet-per.c \
        packet-pflog.c \
        packet-pgm.c   \
        packet-pim.c   \
@@ -317,6 +333,7 @@ DISSECTOR_SRC = \
        packet-prism.c \
        packet-q2931.c \
        packet-q931.c  \
+       packet-q933.c  \
        packet-qllc.c  \
        packet-quake.c \
        packet-quake2.c \
@@ -351,6 +368,7 @@ DISSECTOR_SRC = \
        packet-sctp.c  \
        packet-sdlc.c  \
        packet-sdp.c   \
+       packet-sflow.c \
        packet-sip.c   \
        packet-skinny.c   \
        packet-slimp3.c   \
@@ -377,12 +395,14 @@ DISSECTOR_SRC = \
        packet-ssl.c   \
        packet-stat.c   \
        packet-stat-notify.c \
+       packet-stun.c  \
        packet-sua.c   \
        packet-syslog.c \
        packet-tacacs.c \
        packet-tcp.c   \
        packet-tds.c   \
        packet-telnet.c\
+       packet-teredo.c\
        packet-tftp.c  \
        packet-time.c  \
        packet-tns.c \
@@ -430,42 +450,46 @@ plugin_libs = \
        plugins/giop/cosnaming.la \
        plugins/giop/coseventcomm.la \
        plugins/gryphon/gryphon.la \
+       plugins/lwres/lwres.la \
        plugins/megaco/megaco.la \
        plugins/mgcp/mgcp.la \
-       plugins/pcli/pcli.la
+       plugins/pcli/pcli.la \
+       plugins/rtnet/rtnet.la 
 
 if ENABLE_STATIC
 plugin_ldadd = \
-       plugins/artnet/packet-artnet-static.o \
-       plugins/docsis/packet-bpkmattr-static.o \
-       plugins/docsis/packet-bpkmreq-static.o \
-       plugins/docsis/packet-bpkmrsp-static.o \
-       plugins/docsis/packet-docsis-static.o \
-       plugins/docsis/packet-dsaack-static.o \
-       plugins/docsis/packet-dsareq-static.o \
-       plugins/docsis/packet-dsarsp-static.o \
-       plugins/docsis/packet-dscack-static.o \
-       plugins/docsis/packet-dscreq-static.o \
-       plugins/docsis/packet-dscrsp-static.o \
-       plugins/docsis/packet-dsdreq-static.o \
-       plugins/docsis/packet-dsdrsp-static.o \
-       plugins/docsis/packet-macmgmt-static.o \
-       plugins/docsis/packet-map-static.o \
-       plugins/docsis/packet-regack-static.o \
-       plugins/docsis/packet-regreq-static.o \
-       plugins/docsis/packet-regrsp-static.o \
-       plugins/docsis/packet-rngreq-static.o \
-       plugins/docsis/packet-rngrsp-static.o \
-       plugins/docsis/packet-tlv-static.o \
-       plugins/docsis/packet-uccreq-static.o \
-       plugins/docsis/packet-uccrsp-static.o \
-       plugins/docsis/packet-ucd-static.o \
-       plugins/giop/packet-cosnaming-static.o \
-       plugins/giop/packet-coseventcomm-static.o \
-       plugins/gryphon/packet-gryphon-static.o \
-       plugins/megaco/packet-megaco-static.o \
-       plugins/mgcp/packet-mgcp-static.o \
-       plugins/pcli/packet-pcli-static.o
+       plugins/artnet/packet-artnet.o \
+       plugins/docsis/packet-bpkmattr.o \
+       plugins/docsis/packet-bpkmreq.o \
+       plugins/docsis/packet-bpkmrsp.o \
+       plugins/docsis/packet-docsis.o \
+       plugins/docsis/packet-dsaack.o \
+       plugins/docsis/packet-dsareq.o \
+       plugins/docsis/packet-dsarsp.o \
+       plugins/docsis/packet-dscack.o \
+       plugins/docsis/packet-dscreq.o \
+       plugins/docsis/packet-dscrsp.o \
+       plugins/docsis/packet-dsdreq.o \
+       plugins/docsis/packet-dsdrsp.o \
+       plugins/docsis/packet-macmgmt.o \
+       plugins/docsis/packet-map.o \
+       plugins/docsis/packet-regack.o \
+       plugins/docsis/packet-regreq.o \
+       plugins/docsis/packet-regrsp.o \
+       plugins/docsis/packet-rngreq.o \
+       plugins/docsis/packet-rngrsp.o \
+       plugins/docsis/packet-tlv.o \
+       plugins/docsis/packet-uccreq.o \
+       plugins/docsis/packet-uccrsp.o \
+       plugins/docsis/packet-ucd.o \
+       plugins/giop/packet-cosnaming.o \
+       plugins/giop/packet-coseventcomm.o \
+       plugins/gryphon/packet-gryphon.o \
+       plugins/lwres/packet-lwres.o \
+       plugins/megaco/packet-megaco.o \
+       plugins/mgcp/packet-mgcp.o \
+       plugins/pcli/packet-pcli.o \
+       plugins/rtnet/packet-rtnet.o 
 
 plugin_src = \
        plugins/artnet/packet-artnet.c \
@@ -495,9 +519,11 @@ plugin_src = \
        plugins/giop/packet-cosnaming.c \
        plugins/giop/packet-coseventcomm.c \
        plugins/gryphon/packet-gryphon.c \
+       plugins/lwres/packet-lwres.c \
        plugins/megaco/packet-megaco.c \
        plugins/mgcp/packet-mgcp.c \
-       plugins/pcli/packet-pcli.c
+       plugins/pcli/packet-pcli.c \
+       plugins/rtnet/packet-rtnet.c 
 
 else           # ENABLE_STATIC
 plugin_ldadd = \
@@ -507,9 +533,11 @@ plugin_ldadd = \
        "-dlopen" plugins/giop/cosnaming.la \
        "-dlopen" plugins/giop/coseventcomm.la \
        "-dlopen" plugins/gryphon/gryphon.la \
+       "-dlopen" plugins/lwres/lwres.la \
        "-dlopen" plugins/megaco/megaco.la \
        "-dlopen" plugins/mgcp/mgcp.la \
-       "-dlopen" plugins/pcli/pcli.la
+       "-dlopen" plugins/pcli/pcli.la \
+       "-dlopen" plugins/rtnet/rtnet.la 
 
 plugin_src =
 
@@ -561,6 +589,7 @@ noinst_HEADERS = \
        packet-diameter-defs.h \
        packet-dns.h   \
        packet-dvmrp.h \
+       packet-edonkey.h \
        packet-esis.h  \
        packet-eth.h   \
        packet-fc.h \
@@ -579,6 +608,8 @@ noinst_HEADERS = \
        packet-gnutella.h \
        packet-gssapi.h \
        packet-gtp.h    \
+       packet-h225.h    \
+       packet-h245.h    \
        packet-hclnfsd.h  \
        packet-hpext.h  \
        packet-http.h  \
@@ -611,12 +642,12 @@ noinst_HEADERS = \
        packet-nfs.h   \
        packet-nisplus.h \
        packet-nlm.h   \
-       packet-ntlmssp.h  \
        packet-ntp.h  \
        packet-null.h  \
        packet-osi-options.h \
        packet-osi.h   \
        packet-pcnfsd.h \
+       packet-per.h   \
        packet-pflog.h \
        packet-pim.h   \
        packet-portmap.h   \
@@ -666,6 +697,8 @@ noinst_HEADERS = \
        packet-ypxfr.h
 
 ETHEREAL_COMMON_SRC = \
+       adler32.c      \
+       adler32.h      \
        afn.c          \
        afn.h          \
        aftypes.h      \
@@ -684,6 +717,8 @@ ETHEREAL_COMMON_SRC = \
        column.h       \
        conditions.c   \
        conditions.h   \
+       crc32.c        \
+       crc32.h        \
        crypt-des.c    \
        crypt-des.h    \
        crypt-md4.c    \
@@ -692,7 +727,8 @@ ETHEREAL_COMMON_SRC = \
        crypt-md5.h    \
        crypt-rc4.c    \
        crypt-rc4.h    \
-       packet-dcerpc-nt.c \
+       disabled_protos.c      \
+       disabled_protos.h      \
        etypes.h       \
        file.h         \
        follow.c       \
@@ -703,11 +739,13 @@ ETHEREAL_COMMON_SRC = \
        greproto.h     \
        in_cksum.c     \
        in_cksum.h     \
+       ip_opts.h      \
        ipproto.c      \
        ipproto.h      \
        llcsaps.h      \
        nlpid.h        \
        oui.h          \
+       packet-dcerpc-nt.c \
        pcap-util.c    \
        pcap-util.h    \
        ppptypes.h     \
@@ -726,6 +764,7 @@ ETHEREAL_COMMON_SRC = \
        ringbuffer.c   \
        ringbuffer.h   \
        rpc_defrag.h   \
+       rtp_pt.h       \
        sctpppids.h    \
        smb.h          \
        tap.c           \
@@ -827,7 +866,9 @@ ethereal_LDADD = \
        @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
 
 TETHEREAL_TAP_SRC = \
+       tap-bootpstat.c         \
        tap-dcerpcstat.c        \
+       tap-httpstat.c          \
        tap-iostat.c            \
        tap-iousers.c           \
        tap-mgcpstat.c          \
@@ -836,7 +877,8 @@ TETHEREAL_TAP_SRC = \
        tap-rpcstat.c           \
        tap-rpcprogs.c          \
        tap-smbsids.c           \
-       tap-smbstat.c
+       tap-smbstat.c           \
+       tap-wspstat.c
 
 tethereal_SOURCES = \
        $(DISSECTOR_SRC) \
@@ -943,7 +985,7 @@ SUFFIXES = .sh
 register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
        @if test -n $(PYTHON); then \
                echo Making register.c with python ; \
-               $(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC) ; \
+               $(PYTHON) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC) ; \
        else \
                echo Making register.c with shell script ; \
                $(srcdir)/make-reg-dotc register.c $(srcdir) \
@@ -1005,7 +1047,7 @@ dftest_LDADD = \
        @SNMP_LIBS@ @SSL_LIBS@          \
        $(plugin_ldadd)                 \
        @GLIB_LIBS@ -lm \
-       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
+       @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
 
 dftest_LDFLAGS = -export-dynamic
 
git mirror of the wireshark svn