diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-11-29 20:53:22 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-11-29 20:53:22 +0000 |
| commit | 5f3ff94816007879a58e88a203463163de06d3bf (patch) | |
| tree | 5a70c061e2119b5f98ed8f47a35e8ca384869aee /gtk | |
| parent | 28fa4266d738a109470c22ebe9b339f53e96f831 (diff) | |
Move the checkapi targes to Makefile.common. Rename Makefile.nmake's WIRESHARK_GTK_SRC to WIRESHARK_GTK_ALL_SRC to avoid reusing the variable of the same name from Makefile.common; Put DIRTY_GENERATED_C_FILES back in that variable since checkapi is no longer run on it.
svn path=/trunk/; revision=35069
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/Makefile.am | 6 | ||||
| -rw-r--r-- | gtk/Makefile.common | 11 | ||||
| -rw-r--r-- | gtk/Makefile.nmake | 16 |
3 files changed, 14 insertions, 19 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 18d2a0dcd1..49c6c04bfc 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -70,12 +70,6 @@ if HAVE_DOXYGEN $(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN -checkapi: - $(PERL) ../tools/checkAPIs.pl \ - $(WIRESHARK_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) \ - capture_if_details_dlg_win32.c - expert_indicators.h: echo "/* This file was automatically generated. DO NOT EDIT. */" > $@ echo >> $@ diff --git a/gtk/Makefile.common b/gtk/Makefile.common index b3fa7bee0a..3f713144b7 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -335,3 +335,14 @@ noinst_HEADERS = \ voip_calls_dlg.h \ webbrowser.h +checkapi: checkapi-base checkapi-todo + +checkapi-base: + $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \ + $(WIRESHARK_GTK_SRC) \ + $(WIRESHARK_TAP_SRC) + +checkapi-todo: + $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ + $(WIRESHARK_GTK_SRC) \ + $(WIRESHARK_TAP_SRC) diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 5da46b0ded..760bc34595 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -28,9 +28,10 @@ include Makefile.common # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -WIRESHARK_GTK_SRC = \ +WIRESHARK_GTK_ALL_SRC = \ $(WIRESHARK_GTK_SRC) \ $(GENERATED_C_FILES) \ + $(DIRTY_GENERATED_C_FILES) \ capture_if_details_dlg_win32.c \ !IFDEF PORTAUDIO_DIR !IF "$(PORTAUDIO_VERSION)" == "18" @@ -56,7 +57,7 @@ WIRESHARK_GTK_SRC = \ WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj) -WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_SRC:.c=.obj) $(DIRTY_GENERATED_C_FILES:.c=.obj) +WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_ALL_SRC:.c=.obj) libui.lib : ..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) @@ -169,14 +170,3 @@ doxygen.chm: doxygen: doxygen.cfg doxygen-run doxygen.chm -checkapi: checkapi-base checkapi-todo - -checkapi-base: - $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \ - $(WIRESHARK_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) - -checkapi-todo: - $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \ - $(WIRESHARK_GTK_SRC) \ - $(WIRESHARK_TAP_SRC) |