diff options
| -rw-r--r-- | ui/gtk/Makefile.am | 14 | ||||
| -rw-r--r-- | ui/gtk/Makefile.nmake | 24 |
2 files changed, 21 insertions, 17 deletions
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index e11c3a5205..b95536b116 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -61,12 +61,15 @@ 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) +WIRESHARK_CLEAN_LIBGTKUI_SRC = \ + $(WIRESHARK_GTK_SRC) \ + $(WIRESHAR_TAP_SRC) \ + $(GENERATED_C_FILES) + libgtkui_a_SOURCES = \ - $(WIRESHARK_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) \ + $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ $(noinst_HEADERS) \ - $(GENERATED_HEADER_FILES) \ - $(GENERATED_C_FILES) + $(GENERATED_HEADER_FILES) libgtkui_a_CFLAGS = $(AM_CLEAN_CFLAGS) @@ -90,8 +93,7 @@ checkapi: checkapi-base checkapi-todo checkapi-base: $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ - $(WIRESHARK_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) \ + $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ capture_if_details_dlg_win32.c checkapi-todo: diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index 8b06f54515..5503c8c9f5 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -28,12 +28,16 @@ include Makefile.common # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -WIRESHARK_GTK_SRC = \ +WIRESHARK_CLEAN_LIBGTKUI_SRC = \ $(WIRESHARK_GTK_SRC) \ + $(WIRESHARK_TAP_SRC) \ $(GENERATED_C_FILES) \ - $(DIRTY_GENERATED_C_FILES) \ capture_if_details_dlg_win32.c +WIRESHARK_LIBGTKUI_SRC = \ + $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ + $(DIRTY_GENERATED_C_FILES) \ + PORT_AUDIO_SRC = \ !IFDEF PORTAUDIO_DIR !IF "$(PORTAUDIO_VERSION)" == "18" @@ -56,14 +60,12 @@ PORT_AUDIO_SRC = \ pa_win_wmme.c !ENDIF -WIRESHARK_GTK_OBJECTS = \ - $(WIRESHARK_GTK_SRC:.c=.obj) \ +WIRESHARK_LIBGTKUI_OBJECTS = \ + $(WIRESHARK_LIBGTKUI_SRC:.c=.obj) \ $(PORT_AUDIO_SRC:.c=.obj) -WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj) - -libgtkui.lib : ..\..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) - link /lib /out:libgtkui.lib $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib +libgtkui.lib : ..\..\config.h $(WIRESHARK_LIBGTKUI_OBJECTS) + link /lib /out:libgtkui.lib $(WIRESHARK_LIBGTKUI_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, @@ -144,7 +146,7 @@ pa_win_waveformat.obj: $(PORTAUDIO_DIR)\src\os\win\pa_win_waveformat.c !ENDIF clean: - rm -f $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libgtkui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl + rm -f $(WIRESHARK_LIBGTKUI_OBJECTS) libgtkui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl if exist html rmdir html distclean: clean @@ -177,10 +179,10 @@ checkapi: checkapi-base checkapi-todo checkapi-base: $(PERL) ../../tools/checkAPIs.pl -g deprecated-gtk \ - $(WIRESHARK_GTK_SRC) \ + $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ $(WIRESHARK_TAP_SRC) checkapi-todo: $(PERL) ../../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ - $(WIRESHARK_GTK_SRC) \ + $(WIRESHARK_CLEAN_LIBGTKUI_SRC) \ $(WIRESHARK_TAP_SRC) |