From 4a6e73c84adbf4900f395e02cff8d6e34f6d24d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 2 Mar 2004 01:21:56 +0000 Subject: Move the dissectors into libethereal (no static/shared lib changes): - Create epan/Makefile.common - Move dissector_src and helper files from Makefile.common to epan/Makefile.common - Create register.c in epan/ - link all the files into libethereal - put plugin_src into epan/Makefile.am Try to make rpms build with rpm v4 again (sorry, I've forgotten who to attribute this to). svn path=/trunk/; revision=10273 --- Makefile.common | 461 +------------------------------------------------------- 1 file changed, 1 insertion(+), 460 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index fe6c33d60c..e1fdd8467c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.25 2004/02/29 08:01:21 guy Exp $ +# $Id: Makefile.common,v 1.26 2004/03/02 01:21:56 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -24,430 +24,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# the dissector sources (without any helpers) -DISSECTOR_SRC = \ - packet-aarp.c \ - packet-acap.c \ - packet-acse.c \ - packet-afp.c \ - packet-afs.c \ - packet-aim.c \ - packet-ajp13.c \ - packet-alcap.c \ - packet-ans.c \ - packet-ansi_637.c \ - packet-ansi_683.c \ - packet-ansi_a.c \ - packet-ansi_map.c \ - packet-aodv.c \ - packet-arcnet.c \ - packet-arp.c \ - packet-asap.c \ - packet-ascend.c \ - packet-asf.c \ - packet-atalk.c \ - packet-atm.c \ - packet-auto_rp.c \ - packet-bacapp.c \ - packet-bacnet.c \ - packet-beep.c \ - packet-ber.c \ - packet-bfd.c \ - packet-bgp.c \ - packet-bofl.c \ - packet-bootp.c \ - packet-bootparams.c \ - packet-bpdu.c \ - packet-brdwlk.c \ - packet-bssap.c \ - packet-bssgp.c \ - packet-bvlc.c \ - packet-cast.c \ - packet-ccsds.c \ - packet-cdp.c \ - packet-cgmp.c \ - packet-chdlc.c \ - packet-cisco-oui.c \ - packet-clearcase.c \ - packet-clip.c \ - packet-clnp.c \ - packet-cops.c \ - packet-cosine.c \ - packet-cpfi.c \ - packet-cpha.c \ - packet-cups.c \ - packet-data.c \ - packet-dccp.c \ - packet-dcerpc-afs4int.c \ - packet-dcerpc-atsvc.c \ - packet-dcerpc-bossvr.c \ - packet-dcerpc-browser.c \ - packet-dcerpc-budb.c \ - packet-dcerpc-butc.c \ - packet-dcerpc-cds_clerkserver.c \ - packet-dcerpc-cds_solicit.c \ - packet-dcerpc-conv.c \ - packet-dcerpc-cprpc_server.c \ - packet-dcerpc-dce122.c \ - packet-dcerpc-dfs.c \ - packet-dcerpc-dnsserver.c \ - packet-dcerpc-drsuapi.c \ - packet-dcerpc-dtsprovider.c \ - packet-dcerpc-dtsstime_req.c \ - packet-dcerpc-epm.c \ - packet-dcerpc-epm4.c \ - packet-dcerpc-fldb.c \ - packet-dcerpc-ftserver.c \ - packet-dcerpc-icl_rpc.c \ - packet-dcerpc-initshutdown.c \ - packet-dcerpc-krb5rpc.c \ - packet-dcerpc-llb.c \ - packet-dcerpc-lsa-ds.c \ - packet-dcerpc-lsa.c \ - packet-dcerpc-mapi.c \ - packet-dcerpc-messenger.c \ - packet-dcerpc-mgmt.c \ - packet-dcerpc-ndr.c \ - packet-dcerpc-netlogon.c \ - packet-dcerpc-nspi.c \ - packet-dcerpc-oxid.c \ - packet-dcerpc-rdaclif.c \ - packet-dcerpc-reg.c \ - packet-dcerpc-remact.c \ - packet-dcerpc-rep_proc.c \ - packet-dcerpc-roverride.c \ - packet-dcerpc-rpriv.c \ - packet-dcerpc-rs_acct.c \ - packet-dcerpc-rs_attr.c \ - packet-dcerpc-rs_attr_schema.c \ - packet-dcerpc-rs_bind.c \ - packet-dcerpc-rs_misc.c \ - packet-dcerpc-rs_pgo.c \ - packet-dcerpc-rs_plcy.c \ - packet-dcerpc-rs_prop_acct.c \ - packet-dcerpc-rs_prop_acl.c \ - packet-dcerpc-rs_prop_attr.c \ - packet-dcerpc-rs_prop_pgo.c \ - packet-dcerpc-rs_prop_plcy.c \ - packet-dcerpc-rs_pwd_mgmt.c \ - packet-dcerpc-rs_repadm.c \ - packet-dcerpc-rs_replist.c \ - packet-dcerpc-rs_repmgr.c \ - packet-dcerpc-rs_unix.c \ - packet-dcerpc-rsec_login.c \ - packet-dcerpc-samr.c \ - packet-dcerpc-secidmap.c \ - packet-dcerpc-spoolss.c \ - packet-dcerpc-srvsvc.c \ - packet-dcerpc-svcctl.c \ - packet-dcerpc-tapi.c \ - packet-dcerpc-tkn4int.c \ - packet-dcerpc-trksvr.c \ - packet-dcerpc-ubikdisk.c \ - packet-dcerpc-ubikvote.c \ - packet-dcerpc-update.c \ - packet-dcerpc-wkssvc.c \ - packet-dcerpc.c \ - packet-ddtp.c \ - packet-dec-bpdu.c \ - packet-dhcpv6.c \ - packet-diameter.c \ - packet-diffserv-mpls-common.c \ - packet-distcc.c \ - packet-dlsw.c \ - packet-dns.c \ - packet-dsi.c \ - 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 \ - packet-ethertype.c \ - packet-fc.c \ - packet-fcct.c \ - packet-fcdns.c \ - packet-fcels.c \ - packet-fcfcs.c \ - packet-fcfzs.c \ - packet-fcip.c \ - packet-fclctl.c \ - packet-fcp.c \ - packet-fcsb3.c \ - packet-fcsp.c \ - packet-fcswils.c \ - packet-fddi.c \ - packet-fix.c \ - packet-fr.c \ - packet-frame.c \ - packet-ftp.c \ - packet-fw1.c \ - packet-giop.c \ - packet-gmrp.c \ - packet-gnutella.c \ - packet-gprs-ns.c \ - packet-gre.c \ - packet-gsm_a.c \ - packet-gsm_map.c \ - packet-gsm_sms.c \ - packet-gsm_sms_ud.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-h450.c \ - packet-hclnfsd.c \ - packet-hpext.c \ - packet-hsrp.c \ - packet-http.c \ - packet-hyperscsi.c \ - packet-iapp.c \ - packet-iax2.c \ - packet-ib.c \ - packet-icap.c \ - packet-icmpv6.c \ - packet-icp.c \ - packet-icq.c \ - packet-ieee80211.c \ - packet-ieee8023.c \ - packet-igap.c \ - packet-igmp.c \ - packet-igrp.c \ - packet-image-gif.c \ - packet-image-jfif.c \ - packet-imap.c \ - packet-ip.c \ - packet-ipfc.c \ - packet-ipmi.c \ - packet-ipp.c \ - packet-ipsec-udp.c \ - packet-ipsec.c \ - packet-ipv6.c \ - packet-ipx.c \ - packet-ipxwan.c \ - packet-irc.c \ - packet-isakmp.c \ - packet-iscsi.c \ - packet-isdn.c \ - packet-isis-clv.c \ - packet-isis-hello.c \ - packet-isis-lsp.c \ - packet-isis-snp.c \ - packet-isis.c \ - packet-isl.c \ - packet-ismp.c \ - packet-isns.c \ - packet-isup.c \ - packet-iua.c \ - packet-jabber.c \ - packet-kadm5.c \ - packet-kerberos.c \ - packet-klm.c \ - packet-kpasswd.c \ - packet-l2tp.c \ - 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 \ - packet-m3ua.c \ - packet-mbtcp.c \ - packet-mdshdr.c \ - packet-mip.c \ - packet-mip6.c \ - packet-mmse.c \ - packet-mount.c \ - packet-mpeg1.c \ - packet-mpls.c \ - packet-mrdisc.c \ - packet-msdp.c \ - packet-msn-messenger.c \ - packet-msnip.c \ - packet-msproxy.c \ - packet-mtp2.c \ - packet-mtp3.c \ - packet-mtp3mg.c \ - packet-multipart.c \ - packet-mysql.c \ - packet-nbipx.c \ - packet-nbns.c \ - packet-ncp.c \ - packet-ncp2222.c \ - packet-ncp-nmas.c \ - packet-ndmp.c \ - packet-ndps.c \ - packet-netbios.c \ - packet-netflow.c \ - packet-nfs.c \ - packet-nfsacl.c \ - packet-nfsauth.c \ - packet-nisplus.c \ - packet-nlm.c \ - packet-nlsp.c \ - packet-nntp.c \ - packet-nt-oui.c \ - packet-nt-sonmp.c \ - packet-nt-tpcp.c \ - packet-ntlmssp.c \ - packet-ntp.c \ - packet-null.c \ - packet-olsr.c \ - packet-osi-options.c \ - packet-osi.c \ - packet-ospf.c \ - packet-pcnfsd.c \ - packet-per.c \ - packet-pflog.c \ - packet-pgm.c \ - packet-pim.c \ - packet-pop.c \ - packet-portmap.c \ - packet-postgresql.c \ - packet-ppp.c \ - packet-pppoe.c \ - packet-pptp.c \ - packet-pres.c \ - packet-prism.c \ - packet-q2931.c \ - packet-q931.c \ - packet-q933.c \ - packet-qllc.c \ - packet-quake.c \ - packet-quake2.c \ - packet-quake3.c \ - packet-quakeworld.c \ - packet-radius.c \ - packet-radiotap.c \ - packet-ranap.c \ - packet-raw.c \ - packet-rip.c \ - packet-ripng.c \ - packet-rlogin.c \ - packet-rmcp.c \ - packet-rmi.c \ - packet-rmp.c \ - packet-rpc.c \ - packet-rpl.c \ - packet-rquota.c \ - packet-rsh.c \ - packet-rstat.c \ - packet-rsvp.c \ - packet-rsync.c \ - packet-rtcp.c \ - packet-rtp-events.c \ - packet-rtp.c \ - packet-rtsp.c \ - packet-rwall.c \ - packet-rx.c \ - packet-sadmind.c \ - packet-sap.c \ - packet-sccp.c \ - packet-sccpmg.c \ - packet-scsi.c \ - packet-sctp.c \ - packet-sdlc.c \ - packet-sdp.c \ - packet-sebek.c \ - packet-ses.c \ - packet-sflow.c \ - packet-sip.c \ - packet-sipfrag.c \ - packet-skinny.c \ - packet-slimp3.c \ - packet-sll.c \ - packet-slowprotocols.c \ - packet-slsk.c \ - packet-smb-browse.c \ - packet-smb-common.c \ - packet-smb-logon.c \ - packet-smb-mailslot.c \ - packet-smb-pipe.c \ - packet-smb-sidsnooping.c \ - packet-smb.c \ - packet-smpp.c \ - packet-smtp.c \ - packet-sna.c \ - packet-snaeth.c \ - packet-snmp.c \ - packet-socks.c \ - packet-spnego.c \ - packet-spray.c \ - packet-srvloc.c \ - packet-sscop.c \ - packet-ssh.c \ - packet-ssl.c \ - packet-stat-notify.c \ - packet-stat.c \ - packet-stun.c \ - packet-sua.c \ - packet-syslog.c \ - packet-t38.c \ - packet-tacacs.c \ - packet-tcap.c \ - packet-tcp.c \ - packet-tds.c \ - packet-teimanagement.c \ - packet-telnet.c \ - packet-teredo.c \ - packet-text-media.c \ - packet-tftp.c \ - packet-time.c \ - packet-tns.c \ - packet-tpkt.c \ - packet-tr.c \ - packet-trmac.c \ - packet-tsp.c \ - packet-tzsp.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 \ - packet-wap.c \ - packet-wbxml.c \ - packet-wccp.c \ - packet-wcp.c \ - packet-wfleet-hdlc.c \ - packet-who.c \ - packet-wlancap.c \ - packet-wsp.c \ - packet-wtls.c \ - packet-wtp.c \ - packet-x11.c \ - packet-x25.c \ - packet-x29.c \ - packet-xdmcp.c \ - packet-xot.c \ - packet-xyplex.c \ - packet-yhoo.c \ - packet-ymsg.c \ - packet-ypbind.c \ - packet-yppasswd.c \ - packet-ypserv.c \ - packet-ypxfr.c \ - packet-zebra.c - # corresponding headers DISSECTOR_INCLUDES = \ packet-acse.h \ @@ -617,33 +193,6 @@ DISSECTOR_INCLUDES = \ packet-ypserv.h \ packet-ypxfr.h -# dissector helpers (needed from the dissectors, but not a dissector itself) -DISSECTOR_SUPPORT_SRC = \ - adler32.c \ - afn.c \ - asn1.c \ - column.c \ - crc32.c \ - crypt-des.c \ - crypt-md4.c \ - crypt-md5.c \ - crypt-rc4.c \ - follow.c \ - g711.c \ - h225-persistentdata.c \ - in_cksum.c \ - ipproto.c \ - packet-dcerpc-nt.c \ - prefs.c \ - ptvcursor.c \ - reassemble.c \ - req_resp_hdrs.c \ - t35.c \ - tap.c \ - util.c \ - xdlc.c \ - xmlstub.c - # corresponding headers DISSECTOR_SUPPORT_INCLUDES = \ adler32.h \ @@ -698,7 +247,6 @@ BUILT_SOURCES = \ # sources common for ethereal and tethereal ETHEREAL_COMMON_SRC = \ $(PLATFORM_SRC) \ - $(DISSECTOR_SUPPORT_SRC) \ capture_stop_conditions.c \ cfile.c \ conditions.c \ @@ -770,9 +318,7 @@ EXTRA_ethereal_INCLUDES = \ # ethereal specifics ethereal_SOURCES = \ - $(DISSECTOR_SRC) \ $(ETHEREAL_COMMON_SRC) \ - register.c \ alert_box.c \ capture.c \ file.c \ @@ -798,11 +344,9 @@ ethereal_INCLUDES = \ # tethereal specifics tethereal_SOURCES = \ - $(DISSECTOR_SRC) \ $(ETHEREAL_COMMON_SRC) \ $(TETHEREAL_TAP_SRC) \ tethereal-tap-register.c \ - register.c \ tethereal.c # text2pcap specifics @@ -821,9 +365,6 @@ editcap_SOURCES = \ # dftest specifics dftest_SOURCES = \ - $(DISSECTOR_SRC) \ - $(DISSECTOR_SUPPORT_SRC) \ - register.c \ dftest.c # randpkt specifics -- cgit v1.2.3