diff options
| author | Nathan Neulinger <nneul@umr.edu> | 2000-01-30 16:57:20 +0000 |
|---|---|---|
| committer | Nathan Neulinger <nneul@umr.edu> | 2000-01-30 16:57:20 +0000 |
| commit | 53db0d558742e96e0a89b6f3930ed9fa0a4bd1eb (patch) | |
| tree | ff2e97f5b09dba84b407c811f566560d515fc0df | |
| parent | 4494fa53a843898fe70c5f26d81c0564e730e1d8 (diff) | |
| download | wireshark-53db0d558742e96e0a89b6f3930ed9fa0a4bd1eb.tar.gz wireshark-53db0d558742e96e0a89b6f3930ed9fa0a4bd1eb.tar.bz2 wireshark-53db0d558742e96e0a89b6f3930ed9fa0a4bd1eb.zip | |
Added ethereal_static extra target in Makefile.am. Did not add the updates
to configure.in. This should allow someone to do 'make ethereal_static' and
get a staticly built copy of ethereal w/o plugin support on platforms that
support -Wl,-static for static linking.
svn path=/trunk/; revision=1585
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 20 |
2 files changed, 19 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore index 122bab3d5e..4abbf4f68f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -16,6 +16,7 @@ dfilter-scanner.c editcap editcap.1 ethereal +ethereal_static ethereal.1 ethereal.spec install-sh diff --git a/Makefile.am b/Makefile.am index fefaa71578..1cbfe80b24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.159 2000/01/26 07:00:14 oabad Exp $ +# $Id: Makefile.am,v 1.160 2000/01/30 16:57:20 nneul Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -22,6 +22,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +EXTRA_PROGRAMS = ethereal_static bin_PROGRAMS = ethereal editcap tethereal man_MANS = ethereal.1 editcap.1 tethereal.1 @@ -233,6 +234,9 @@ ethereal_SOURCES = \ summary.h \ ui_util.h +ethereal_static_SOURCES = \ + $(ethereal_SOURCES) + EXTRA_ethereal_SOURCES = \ dfilter-grammar.c \ dfilter-grammar.h \ @@ -257,7 +261,8 @@ EXTRA_ethereal_SOURCES = \ # we should probably split this into stuff needed both # by ethereal and tethereal and stuff needed only by one or the # other. -ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ @STRNCASECMP_O@ @MKSTEMP_O@ \ +ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \ + @STRNCASECMP_O@ @MKSTEMP_O@ \ @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ # Additional libs that I know how to build. These will be @@ -270,6 +275,10 @@ ethereal_DEPENDENCIES = \ $(ethereal_additional_libs) \ plugins/gryphon/gryphon.la +ethereal_static_DEPENDENCIES = \ + $(ethereal_optional_objects) \ + $(ethereal_additional_libs) + # This automake variable adds to the link-line for the executable. # # Note that Ethereal doesn't have to be linked with @GLIB_LIBS@, as @@ -284,7 +293,14 @@ ethereal_LDADD = \ "-dlopen" self \ "-dlopen" plugins/gryphon/gryphon.la @PCAP_LIBS@ @GTK_LIBS@ +ethereal_static_LDADD = \ + $(ethereal_optional_objects) \ + $(ethereal_additional_libs) \ + @SNMP_LIBS@ \ + @PCAP_LIBS@ @GTK_LIBS@ + ethereal_LDFLAGS = -export-dynamic +ethereal_static_LDFLAGS = -Wl,-static tethereal_SOURCES = \ $(DISSECTOR_SOURCES) \ |