diff options
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | ui/gtk/Makefile.am | 18 | ||||
-rw-r--r-- | ui/gtk/Makefile.nmake | 6 | ||||
-rw-r--r-- | ui/gtk/libgtkui.vcproj (renamed from ui/gtk/libui.vcproj) | 6 | ||||
-rw-r--r-- | wireshark.sln | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 98e830c45c..192dd67873 100644 --- a/Makefile.am +++ b/Makefile.am @@ -386,8 +386,8 @@ endif # @GTK_LIBS@ (as those are also needed for X applications, and GTK+ # applications are X applications). wireshark_LDADD = \ - ui/gtk/libui.a \ - ui/gtk/libui_dirty.a \ + ui/gtk/libgtkui.a \ + ui/gtk/libgtkui_dirty.a \ codecs/libcodec.a \ wiretap/libwiretap.la \ epan/libwireshark.la \ diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 1682192db7..e98e07d260 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -28,11 +28,11 @@ if HAVE_WARNINGS_AS_ERRORS AM_CLEAN_CFLAGS = -Werror endif -noinst_LIBRARIES = libui.a libui_dirty.a +noinst_LIBRARIES = libgtkui.a libgtkui_dirty.a CLEANFILES = \ - libui.a \ - libui_dirty.a \ + libgtkui.a \ + libgtkui_dirty.a \ *~ MAINTAINERCLEANFILES = \ @@ -47,22 +47,22 @@ wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-d @echo Making wireshark-tap-register.c @$(top_srcdir)/tools/make-tapreg-dotc wireshark-tap-register.c $(srcdir) $(WIRESHARK_TAP_SRC) -libui_a_SOURCES = \ +libgtkui_a_SOURCES = \ $(WIRESHARK_GTK_SRC) \ $(GENERATED_C_FILES) \ $(GENERATED_H_FILES) \ $(noinst_HEADERS) \ $(WIRESHARK_TAP_SRC) -libui_a_CFLAGS = $(AM_CLEAN_CFLAGS) +libgtkui_a_CFLAGS = $(AM_CLEAN_CFLAGS) -libui_a_DEPENDENCIES = +libgtkui_a_DEPENDENCIES = -libui_dirty_a_SOURCES = \ +libgtkui_dirty_a_SOURCES = \ $(DIRTY_GENERATED_C_FILES) -libui_dirty_a_DEPENDENCIES = +libgtkui_dirty_a_DEPENDENCIES = # Common headers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) @@ -120,7 +120,7 @@ EXTRA_DIST = \ capture_if_details_dlg_win32.c \ capture_if_details_dlg_win32.h \ doxygen.cfg.in \ - libui.vcproj \ + libgtkui.vcproj \ main_airpcap_toolbar.c \ Makefile.common \ Makefile.nmake \ diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index 01b719ded6..f1543b2e12 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -63,8 +63,8 @@ WIRESHARK_GTK_OBJECTS = \ $(DIRTY_GENERATED_C_FILES:.c=.obj) \ $(PORT_AUDIO_SRC:.c=.obj) -libui.lib : ..\..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) - link /lib /out:libui.lib $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib +libgtkui.lib : ..\..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) + link /lib /out:libgtkui.lib $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib # The shell script runs slowly, as multiple greps and seds are run # for each input file; this is especially slow on Windows. Therefore, @@ -145,7 +145,7 @@ pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c !ENDIF clean: - rm -f $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl + rm -f $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libgtkui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl if exist html rmdir html distclean: clean diff --git a/ui/gtk/libui.vcproj b/ui/gtk/libgtkui.vcproj index c26e3fb2f5..ce5039ae70 100644 --- a/ui/gtk/libui.vcproj +++ b/ui/gtk/libgtkui.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="libui"
+ Name="libgtkui"
ProjectGUID="{57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}"
Keyword="MakeFileProj"
TargetFrameworkVersion="131072"
@@ -26,7 +26,7 @@ BuildCommandLine=""
ReBuildCommandLine=""
CleanCommandLine=""
- Output="libui.exe"
+ Output="libgtkui.exe"
PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"
IncludeSearchPath=""
ForcedIncludes=""
@@ -46,7 +46,7 @@ BuildCommandLine=""
ReBuildCommandLine=""
CleanCommandLine=""
- Output="libui.exe"
+ Output="libgtkui.exe"
PreprocessorDefinitions="WIN32;NDEBUG;HAVE_LIBPCAP;HAVE_LIBPORTAUDIO"
IncludeSearchPath=""
ForcedIncludes=""
diff --git a/wireshark.sln b/wireshark.sln index 835fe9c14c..58e3754f0c 100644 --- a/wireshark.sln +++ b/wireshark.sln @@ -13,7 +13,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark", "wireshark.vcpr EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwiretap", "wiretap\libwiretap.vcproj", "{CD04EABB-BA03-446F-9A63-A00C08138E91}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "ui\gtk\libui.vcproj", "{57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgtkui", "ui\gtk\libgtkui.vcproj", "{57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dumpcap", "dumpcap.vcproj", "{D1417D47-E273-4A90-A49B-6BAF4485CA58}"
EndProject
|