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

Split libui into libui and libui_dirty. The latter contains (only) 

text_import_scanner.c (which is generated and not by us so we can't guarantee
that it's clean).

svn path=/trunk/; revision=34912
This commit is contained in:
Jeff Morriss 2010-11-16 20:13:26 +00:00
parent 6488fe601d
commit d63f2559da
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -310,6 +310,7 @@ endif
# applications are X applications). # applications are X applications).
wireshark_LDADD = \ wireshark_LDADD = \
gtk/libui.a \ gtk/libui.a \
gtk/libui_dirty.a \
codecs/libcodec.a \ codecs/libcodec.a \
wiretap/libwiretap.la \ wiretap/libwiretap.la \
epan/libwireshark.la \ epan/libwireshark.la \
@ -537,7 +538,7 @@ MAINTAINERCLEANFILES = \
depcomp \ depcomp \
install-sh \ install-sh \
ltmain.sh \ ltmain.sh \
missing missing
EXTRA_DIST = \ EXTRA_DIST = \
INSTALL.configure \ INSTALL.configure \

15
gtk/Makefile.am
View File

@ -25,13 +25,14 @@ include Makefile.common
include ../Makefile.am.inc include ../Makefile.am.inc
if HAVE_WARNINGS_AS_ERRORS if HAVE_WARNINGS_AS_ERRORS
AM_CFLAGS = -Werror AM_CLEAN_CFLAGS = -Werror
endif endif
noinst_LIBRARIES = libui.a noinst_LIBRARIES = libui.a libui_dirty.a
CLEANFILES = \ CLEANFILES = \
libui.a \ libui.a \
libui_dirty.a \
*~ *~
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
@ -50,7 +51,15 @@ libui_a_SOURCES = \
$(noinst_HEADERS) \ $(noinst_HEADERS) \
$(WIRESHARK_TAP_SRC) $(WIRESHARK_TAP_SRC)
libui_a_DEPENDENCIES = libui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
libui_a_DEPENDENCIES =
libui_dirty_a_SOURCES = \
$(DIRTY_GENERATED_C_FILES)
libui_dirty_a_DEPENDENCIES =
# Common headers # Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)

4
gtk/Makefile.common
View File

@ -29,7 +29,9 @@ GENERATED_HEADER_FILES = \
# Generated C source files that we want in the distribution. # Generated C source files that we want in the distribution.
GENERATED_C_FILES = \ GENERATED_C_FILES = \
wireshark-tap-register.c \ wireshark-tap-register.c
DIRTY_GENERATED_C_FILES = \
text_import_scanner.c text_import_scanner.c
# All the generated files we want in the distribution. # All the generated files we want in the distribution.

15
gtk/Makefile.nmake
View File

@ -31,6 +31,7 @@ include Makefile.common
WIRESHARK_WIN32_GTK_SRC = \ WIRESHARK_WIN32_GTK_SRC = \
$(WIRESHARK_GTK_SRC) \ $(WIRESHARK_GTK_SRC) \
$(GENERATED_C_FILES) \ $(GENERATED_C_FILES) \
$(DIRTY_GENERATED_C_FILES) \
capture_if_details_dlg_win32.c \ capture_if_details_dlg_win32.c \
file_dlg_win32.c \ file_dlg_win32.c \
print_win32.c \ print_win32.c \
@ -52,14 +53,14 @@ WIRESHARK_WIN32_GTK_SRC = \
pa_x86_plain_converters.c \ pa_x86_plain_converters.c \
pa_win_waveformat.c \ pa_win_waveformat.c \
!ENDIF !ENDIF
pa_win_wmme.c pa_win_wmme.c
!ENDIF !ENDIF
WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj) WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
WIRESHARK_WIN32_GTK_OBJECTS = $(WIRESHARK_WIN32_GTK_SRC:.c=.obj) WIRESHARK_WIN32_GTK_OBJECTS = $(WIRESHARK_WIN32_GTK_SRC:.c=.obj)
libui.lib : ..\config.h $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib : ..\config.h $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS)
link /lib /out:libui.lib $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib link /lib /out:libui.lib $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib
@ -89,7 +90,7 @@ RUNLEX=..\tools\runlex.sh
text_import_scanner.h: text_import_scanner.c text_import_scanner.h: text_import_scanner.c
text_import_scanner.obj : text_import_scanner.c text_import_scanner.obj : text_import_scanner.c
$(CC) $(CVARSDLL) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $? $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $?
!IF "$(PORTAUDIO_VERSION)" == "18" !IF "$(PORTAUDIO_VERSION)" == "18"
pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c
$(CC) -c $(LOCAL_CFLAGS) $? $(CC) -c $(LOCAL_CFLAGS) $?
@ -179,13 +180,13 @@ checkapi-base:
$(WIRESHARK_TAP_SRC) \ $(WIRESHARK_TAP_SRC) \
capture_if_details_dlg_win32.c \ capture_if_details_dlg_win32.c \
file_dlg_win32.c \ file_dlg_win32.c \
print_win32.c print_win32.c
checkapi-todo: checkapi-todo:
$(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
$(WIRESHARK_GTK_SRC) \ $(WIRESHARK_GTK_SRC) \
$(WIRESHARK_TAP_SRC) \ $(WIRESHARK_TAP_SRC) \
capture_if_details_dlg_win32.c \ capture_if_details_dlg_win32.c \
file_dlg_win32.c \ file_dlg_win32.c \
print_win32.c print_win32.c