osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Rename the (static) library built from stuff in ui/gtk to "libgtkui" in 

automake/autoconf and nmake builds, to match the name in CMake builds.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41058 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
guy 2012-02-18 20:21:30 +00:00
parent ffdcbd3f84
commit 29d0c11b20
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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 \

18
ui/gtk/Makefile.am
View File

@ -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 \

6
ui/gtk/Makefile.nmake
View File

@ -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

6
ui/gtk/libui.vcproj → ui/gtk/libgtkui.vcproj
View File

@ -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=""

2
wireshark.sln
View File

@ -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