Some minor bugfixes for netlogon
[obnox/wireshark/wip.git] / Makefile.am
index 72454859fe5dab964575ccb3ea9cb4a1710abce6..ff27376e292bacb78a25f66a45a29acb10b9fa50 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.376 2001/11/06 13:43:44 girlich Exp $
+# $Id: Makefile.am,v 1.416 2002/03/16 02:25:48 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -75,6 +75,7 @@ DISSECTOR_SRC = \
        packet-aarp.c  \
        packet-afs.c   \
        packet-aim.c   \
+       packet-airopeek.c \
        packet-arp.c   \
        packet-ascend.c\
        packet-atalk.c \
@@ -82,12 +83,12 @@ DISSECTOR_SRC = \
        packet-auto_rp.c   \
        packet-bacapp.c   \
        packet-bacnet.c   \
+       packet-beep.c \
        packet-bgp.c   \
        packet-bootp.c \
        packet-bootparams.c \
        packet-bpdu.c  \
        packet-bvlc.c \
-       packet-bxxp.c \
        packet-cdp.c   \
        packet-cgmp.c  \
        packet-chdlc.c  \
@@ -98,16 +99,29 @@ DISSECTOR_SRC = \
        packet-data.c  \
        packet-dcerpc.c  \
        packet-dcerpc-conv.c  \
+       packet-dcerpc-dfs.c \
        packet-dcerpc-epm.c  \
+       packet-dcerpc-lsa.c \
        packet-dcerpc-mgmt.c  \
-       packet-dcerpc-remact.c  \
+       packet-dcerpc-ndr.c  \
+       packet-dcerpc-netlogon.c \
        packet-dcerpc-oxid.c  \
+       packet-dcerpc-reg.c \
+       packet-dcerpc-remact.c  \
+       packet-dcerpc-samr.c \
+       packet-dcerpc-spoolss.c \
+       packet-dcerpc-srvsvc.c \
+       packet-dcerpc-wkssvc.c \
        packet-ddtp.c  \
        packet-dec-bpdu.c \
+       packet-dhcpv6.c \
        packet-diameter.c \
+       packet-dlsw.c  \
        packet-dns.c   \
        packet-dsi.c   \
        packet-dvmrp.c \
+       packet-eap.c \
+       packet-eapol.c \
        packet-eigrp.c \
        packet-esis.c  \
        packet-eth.c   \
@@ -127,6 +141,7 @@ DISSECTOR_SRC = \
        packet-hclnfsd.c  \
        packet-hsrp.c  \
        packet-http.c  \
+       packet-iapp.c  \
        packet-icap.c  \
        packet-icmpv6.c\
        packet-icp.c   \
@@ -164,6 +179,7 @@ DISSECTOR_SRC = \
        packet-lmi.c   \
        packet-lpd.c   \
        packet-m2pa.c  \
+       packet-m2tp.c  \
        packet-m3ua.c  \
        packet-mapi.c  \
        packet-mbtcp.c \
@@ -176,11 +192,13 @@ DISSECTOR_SRC = \
        packet-msdp.c  \
        packet-msnip.c \
        packet-msproxy.c \
+       packet-mtp2.c \
        packet-mtp3.c \
        packet-nbipx.c \
        packet-nbns.c  \
        packet-ncp.c   \
        packet-ncp2222.c   \
+       packet-ndmp.c  \
        packet-netbios.c \
        packet-nfs.c   \
        packet-nisplus.c \
@@ -192,6 +210,7 @@ DISSECTOR_SRC = \
        packet-osi-options.c \
        packet-ospf.c  \
        packet-pcnfsd.c \
+       packet-pflog.c \
        packet-pgm.c   \
        packet-pim.c   \
        packet-pop.c   \
@@ -199,8 +218,10 @@ DISSECTOR_SRC = \
        packet-ppp.c   \
        packet-pppoe.c \
        packet-pptp.c  \
+       packet-prism.c \
        packet-q2931.c \
        packet-q931.c  \
+       packet-qllc.c  \
        packet-quake.c \
        packet-quakeworld.c \
        packet-quake2.c \
@@ -221,10 +242,13 @@ DISSECTOR_SRC = \
        packet-rwall.c \
        packet-rx.c  \
        packet-sap.c   \
-       packet-sctp.c   \
+       packet-sccp.c  \
+       packet-scsi.c  \
+       packet-sctp.c  \
        packet-sdp.c   \
        packet-sip.c   \
        packet-skinny.c   \
+       packet-slimp3.c   \
        packet-sll.c   \
        packet-smb.c   \
        packet-smb-browse.c \
@@ -232,8 +256,10 @@ DISSECTOR_SRC = \
        packet-smb-logon.c \
        packet-smb-mailslot.c \
        packet-smb-pipe.c \
+       packet-smpp.c \
        packet-smtp.c \
        packet-sna.c   \
+       packet-snaeth.c \
        packet-snmp.c   \
        packet-socks.c \
        packet-spray.c \
@@ -253,10 +279,12 @@ DISSECTOR_SRC = \
        packet-tpkt.c  \
        packet-tr.c    \
        packet-trmac.c \
+       packet-tsp.c \
        packet-ucp.c   \
        packet-udp.c   \
        packet-v120.c \
        packet-vines.c \
+       packet-vj.c   \
        packet-vlan.c \
        packet-vrrp.c \
        packet-vtp.c  \
@@ -269,6 +297,7 @@ DISSECTOR_SRC = \
        packet-wtp.c \
        packet-x11.c   \
        packet-x25.c   \
+       packet-xdmcp.c \
        packet-xot.c   \
        packet-yhoo.c  \
        packet-ypbind.c \
@@ -324,6 +353,14 @@ noinst_HEADERS = \
        packet-chdlc.h \
        packet-clip.h  \
        packet-dcerpc.h \
+       packet-dcerpc-dfs.h \
+       packet-dcerpc-lsa.h \
+       packet-dcerpc-netlogon.h \
+       packet-dcerpc-reg.h \
+       packet-dcerpc-samr.h \
+       packet-dcerpc-spoolss.h \
+       packet-dcerpc-srvsvc.h \
+       packet-dcerpc-wkssvc.h \
        packet-ddtp.h  \
        packet-diameter-defs.h \
        packet-dns.h   \
@@ -331,7 +368,6 @@ noinst_HEADERS = \
        packet-esis.h  \
        packet-eth.h   \
        packet-fddi.h  \
-       packet-fr.h    \
        packet-frame.h  \
        packet-giop.h  \
        packet-gnutella.h \
@@ -339,6 +375,7 @@ noinst_HEADERS = \
        packet-http.h  \
        packet-ieee80211.h \
        packet-ieee8023.h \
+       packet-igmp.h  \
        packet-ip.h    \
        packet-ipsec.h \
        packet-ipv6.h  \
@@ -355,6 +392,7 @@ noinst_HEADERS = \
        packet-mount.h \
        packet-mrdisc.h \
        packet-msnip.h \
+       packet-mtp3.h  \
        packet-ncp-int.h \
        packet-netbios.h \
        packet-nfs.h   \
@@ -364,10 +402,13 @@ noinst_HEADERS = \
        packet-null.h  \
        packet-osi.h   \
        packet-osi-options.h \
+       packet-pcnfsd.h \
+       packet-pflog.h \
        packet-pgm.h   \
        packet-pim.h   \
        packet-portmap.h   \
        packet-ppp.h   \
+       packet-prism.h \
        packet-q931.h  \
        packet-raw.h   \
        packet-ripng.h \
@@ -377,6 +418,7 @@ noinst_HEADERS = \
        packet-rtp.h   \
        packet-rwall.h  \
        packet-rx.h  \
+       packet-scsi.h  \
        packet-sll.h   \
        packet-smb-browse.h \
        packet-smb-common.h \
@@ -418,19 +460,26 @@ ETHEREAL_COMMON_SRC = \
        column.c       \
        column.h       \
        color.h        \
+       conditions.c   \
+       conditions.h   \
+       capture_stop_conditions.h   \
+       capture_stop_conditions.c   \
        etypes.h       \
        follow.c       \
        follow.h       \
+       format-oid.h   \
        greproto.h     \
        in_cksum.c     \
        in_cksum.h     \
-       int-64bit.c     \
-       int-64bit.h     \
        ipproto.c      \
        ipproto.h      \
        llcsaps.h      \
        nlpid.h        \
        oui.h          \
+       packet-dcerpc-nt.h \
+       packet-dcerpc-nt.c \
+       pcap-util.c    \
+       pcap-util.h    \
        ppptypes.h     \
        prefs.c        \
        prefs.h        \
@@ -444,11 +493,15 @@ ETHEREAL_COMMON_SRC = \
        reassemble.c   \
        reassemble.h   \
        register.h     \
+       ringbuffer.c   \
+       ringbuffer.h   \
+       rpc_defrag.h   \
        smb.h          \
        util.c         \
        util.h         \
        x11-declarations.h \
        x11-register-info.h \
+       x264_prt_id.h  \
        xdlc.c         \
        xdlc.h         \
        xmlstub.c      \
@@ -620,9 +673,16 @@ tethereal_static_LDADD = \
 tethereal_LDFLAGS = -export-dynamic
 tethereal_static_LDFLAGS = -Wl,-static
 
+# Optional objects that I know how to build, and that are needed by
+# text2pcap.
+text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
+
 text2pcap_SOURCES = text2pcap.c text2pcap-scanner.l
 text2pcap_DEPENDENCIES = text2pcap.h
 
+# This automake variable adds to the link-line for the executable
+text2pcap_LDADD = $(text2pcap_optional_objects)
+
 mergecap_SOURCES = mergecap.c
 mergecap_DEPENDENCIES = wiretap/libwiretap.a
 
@@ -704,6 +764,7 @@ dftest_SOURCES = \
        dftest.c
 
 dftest_additional_libs =               \
+       wiretap/libwiretap.a            \
        epan/libethereal.a              \
        epan/ftypes/libftypes.a         \
        epan/dfilter/libdfilter.a
@@ -735,6 +796,7 @@ DISTCLEANFILES =    \
        *~
 
 EXTRA_DIST = \
+       Ethereal.desktop        \
        aclocal-flags           \
        capture-wpcap.c         \
        capture-wpcap.h         \
@@ -779,19 +841,33 @@ EXTRA_DIST = \
        idl2eth.sh              \
        ieee-float.h            \
        image/Makefile.nmake    \
+       image/README.image      \
+       image/clist_ascend.xpm  \
+       image/clist_descend.xpm \
+       image/dn_arrow.xpm      \
        image/editcap.rc.in     \
+       image/eexcl3d64.xpm     \
+       image/eicon3d16.xpm     \
+       image/eicon3d32.xpm     \
+       image/eicon3d48.xpm     \
+       image/eicon3d64.xpm     \
        image/elogo3d48x48.png  \
-       image/ethereal48x48-trans.png  \
-       image/ethereal48x48.png \
        image/ethereal.ico      \
        image/ethereal.rc.in    \
-       image/icon-excl.xpm     \
-       image/icon-ethereal.xpm \
-       image/clist_ascend.xpm  \
-       image/clist_descend.xpm \
+       image/ethereal48x48-trans.png  \
+       image/ethereal48x48.png \
+       image/hi16-app-ethereal.png     \
+       image/hi32-app-ethereal.png     \
+       image/hi48-app-ethereal.png     \
+       image/icon-ethereal.xpm \
+       image/icon-excl.xpm     \
+       image/lo16-app-ethereal.png     \
+       image/lo32-app-ethereal.png     \
+       image/lo48-app-ethereal.png     \
        image/mergecap.rc.in    \
        image/tethereal.rc.in   \
        image/text2pcap.rc.in   \
+       image/up_arrow.xpm      \
        INSTALL.configure       \
        Makefile.nmake          \
        make-manuf              \
@@ -906,24 +982,30 @@ svr4-package: $(bin_SCRIPTS) $(lib_LTLIBRARIES)
 
 solaris-package: svr4-package
 
-specfile=$(top_srcdir)/packaging/rpm/ethereal.spec
-
+rpm_topdir=`cd $(top_srcdir) && pwd`/packaging/rpm
 rpm-package: dist
-       if test x$(HAVE_RPM_PACKAGING) = xyes ; then \
-               cp $(top_srcdir)/$(distdir).tar.gz $(RPM_SOURCEDIR) ; \
-               rpm -bb --clean --rmsource $(specfile) ; \
+       if test x$(HAVE_RPM) = xyes ; then \
+               cd $(rpm_topdir) ; \
+               mkdir BUILD RPMS SOURCES ; \
+               cd SOURCES ; \
+               ln -s ../../../$(distdir).tar.gz ; \
+               cd .. ; \
+               rpm --define "_topdir `cd . && pwd`" -bb SPECS/ethereal.spec && \
+                       echo "Package successfully built in `pwd`/RPMS." ; \
        else \
                echo "Error: RPM executable and/or source directory not found." ; \
-               echo "Package build abandoned." ; \
        fi
-
 srpm-package: dist
-       if test x$(HAVE_RPM_PACKAGING) = xyes ; then \
-               cp $(top_srcdir)/$(distdir).tar.gz $(RPM_SOURCEDIR) ; \
-               rpm -bs --clean --rmsource $(specfile) ; \
+       if test x$(HAVE_RPM) = xyes ; then \
+               cd $(rpm_topdir) ; \
+               mkdir BUILD SRPMS SOURCES ; \
+               cd SOURCES ; \
+               ln -s ../../../$(distdir).tar.gz ; \
+               cd .. ; \
+               rpm --define "_topdir `cd . && pwd`" -bs SPECS/ethereal.spec && \
+                       echo "Package successfully built in `pwd`/SRPMS." ; \
        else \
                echo "Error: RPM executable and/or source directory not found." ; \
-               echo "Package build abandoned." ; \
        fi
 
 debian-package: debian/rules