diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | Makefile.nmake | 6 | ||||
| -rw-r--r-- | epan/Makefile.am | 10 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index f37065f8d7..db31aaaa47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.232 2000/10/06 10:10:44 gram Exp $ +# $Id: Makefile.am,v 1.233 2000/10/14 03:53:24 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -334,7 +334,7 @@ ethereal_optional_objects = @SNPRINTF_O@ @STRERROR_O@ \ # Additional libs that I know how to build. These will be # linked into the ethereal executable. -ethereal_additional_libs = wiretap/libwiretap.a gtk/libui.a epan/libepan.a +ethereal_additional_libs = wiretap/libwiretap.a gtk/libui.a epan/libethereal.a # This is the automake dependency variable for the executable ethereal_DEPENDENCIES = \ @@ -376,7 +376,7 @@ tethereal_SOURCES = \ # Additional libs that I know how to build. These will be # linked into the tethereal executable. -tethereal_additional_libs = wiretap/libwiretap.a epan/libepan.a +tethereal_additional_libs = wiretap/libwiretap.a epan/libethereal.a # This is the automake dependency variable for the executable tethereal_DEPENDENCIES = \ diff --git a/Makefile.nmake b/Makefile.nmake index 72bb4ab539..eb3b5728b5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: nmake -f makefile.nmake # -# $Id: Makefile.nmake,v 1.56 2000/10/14 03:20:55 gram Exp $ +# $Id: Makefile.nmake,v 1.57 2000/10/14 03:53:24 gram Exp $ include config.nmake @@ -193,7 +193,7 @@ EXTRA_OBJECTS = \ inet_pton.obj \ inet_ntop.obj -ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\libepan.lib \ +ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \ wsock32.lib user32.lib \ $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \ $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \ @@ -201,7 +201,7 @@ ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\libepan.lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ $(PCAP_DIR)\lib\libpcap.lib -tethereal_LIBS= wiretap\libwtap.lib epan\libepan.lib \ +tethereal_LIBS= wiretap\libwtap.lib epan\ethereal.lib \ wsock32.lib user32.lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \ diff --git a/epan/Makefile.am b/epan/Makefile.am index 911302cf16..75cfd73322 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -2,7 +2,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am,v 1.7 2000/10/11 07:35:01 guy Exp $ +# $Id: Makefile.am,v 1.8 2000/10/14 03:53:25 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -30,10 +30,10 @@ YFLAGS=-d -p dfilter_ # EPAN will eventually be a shared library. While I move source code around, # however, it is an archive library. -noinst_LIBRARIES = libepan.a +noinst_LIBRARIES = libethereal.a -libepan_a_SOURCES = \ +libethereal_a_SOURCES = \ conversation.c \ conversation.h \ dfilter-int.h \ @@ -65,7 +65,7 @@ libepan_a_SOURCES = \ tvbuff.c \ tvbuff.h -EXTRA_libepan_a_SOURCES = \ +EXTRA_libethereal_a_SOURCES = \ dfilter-grammar.c \ dfilter-grammar.h \ dfilter-scanner.c @@ -74,7 +74,7 @@ EXTRA_DIST = \ Makefile.nmake CLEANFILES = \ - libepan.a \ + libethereal.a \ *~ dfilter-scanner.c : dfilter-scanner.l diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index b2228468fe..528a7c5434 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -25,8 +25,8 @@ OBJECTS=conversation.obj \ strutil.obj \ tvbuff.obj \ -libepan.lib : ..\config.h $(OBJECTS) - lib /out:libepan.lib $(OBJECTS) +ethereal.lib : ..\config.h $(OBJECTS) + lib /out:ethereal.lib $(OBJECTS) dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h @@ -40,4 +40,4 @@ dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y copy ..\config.h.win32 ..\config.h clean: - rm -f $(OBJECTS) libepan.lib + rm -f $(OBJECTS) ethereal.lib |