diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-30 02:04:55 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-30 02:04:55 +0000 |
| commit | 67f7bbbeb107f262d6f159c94a07eae7f36c589e (patch) | |
| tree | a77d614c25713268240deeedfcdc2e61d107fda5 /gtk | |
| parent | ee04d635249e2625c20f1ba2e7577c2ee8907bd5 (diff) | |
Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35075 f5534014-38df-0310-8fa8-9805f1628bb7
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, 19 insertions, 14 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 49c6c04bfc..18d2a0dcd1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -70,6 +70,12 @@ 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 3f713144b7..b3fa7bee0a 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -335,14 +335,3 @@ 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 760bc34595..5da46b0ded 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -28,10 +28,9 @@ include Makefile.common # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST -WIRESHARK_GTK_ALL_SRC = \ +WIRESHARK_GTK_SRC = \ $(WIRESHARK_GTK_SRC) \ $(GENERATED_C_FILES) \ - $(DIRTY_GENERATED_C_FILES) \ capture_if_details_dlg_win32.c \ !IFDEF PORTAUDIO_DIR !IF "$(PORTAUDIO_VERSION)" == "18" @@ -57,7 +56,7 @@ WIRESHARK_GTK_ALL_SRC = \ WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj) -WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_ALL_SRC:.c=.obj) +WIRESHARK_GTK_OBJECTS = $(WIRESHARK_GTK_SRC:.c=.obj) $(DIRTY_GENERATED_C_FILES:.c=.obj) libui.lib : ..\config.h $(WIRESHARK_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) @@ -170,3 +169,14 @@ 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) |