Always update splash screen when action has changed.

[obnox/wireshark/wip.git] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 82f591b8e2bab79f3f6cd953f0346ee7c74f7ab5..be3a0e527630f279dece840e9237376602e45cf0 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -25,13 +25,14 @@ include Makefile.common
 include ../Makefile.am.inc
 
 if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS = -Werror
+AM_CLEAN_CFLAGS = -Werror
 endif
 
-noinst_LIBRARIES = libui.a
+noinst_LIBRARIES = libui.a libui_dirty.a
 
 CLEANFILES = \
        libui.a         \
+       libui_dirty.a   \
        *~
 
 MAINTAINERCLEANFILES = \
@@ -40,6 +41,8 @@ MAINTAINERCLEANFILES = \
 
 RUNLEX=$(top_srcdir)/tools/runlex.sh
 
+text_import_scanner_lex.h: text_import_scanner.c
+
 wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-dotc
        @echo Making wireshark-tap-register.c
        @$(top_srcdir)/tools/make-tapreg-dotc wireshark-tap-register.c $(srcdir) $(WIRESHARK_TAP_SRC)
@@ -47,10 +50,19 @@ wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) $(top_srcdir)/tools/make-tapreg-d
 libui_a_SOURCES = \
        $(WIRESHARK_GTK_SRC) \
        $(GENERATED_C_FILES) \
+       $(GENERATED_H_FILES) \
        $(noinst_HEADERS) \
        $(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
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
@@ -61,13 +73,19 @@ if HAVE_DOXYGEN
        $(DOXYGEN) doxygen.cfg
 endif          # HAVE_DOXYGEN
 
-checkapi:
-       $(PERL) ../tools/checkAPIs.pl \
+checkapi: checkapi-base checkapi-todo
+
+checkapi-base:
+       $(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \
        $(WIRESHARK_GTK_SRC) \
        $(WIRESHARK_TAP_SRC) \
-       capture_if_details_dlg_win32.c  \
-       file_dlg_win32.c \
-       print_win32.c
+       capture_if_details_dlg_win32.c
+
+checkapi-todo:
+       $(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
+       $(WIRESHARK_GTK_SRC) \
+       $(WIRESHARK_TAP_SRC) \
+       capture_if_details_dlg_win32.c
 
 expert_indicators.h:
        echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
@@ -83,18 +101,23 @@ network_icons.h:
                gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../image/toolbar/network_$${icon}_16.png >> $@ ;\
        done
 
+remote_icons.h:
+       echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
+       echo >> $@
+       for icon in arrow globe sat ; do \
+               gdk-pixbuf-csource --raw --name=remote_$${icon}_pb_data ../image/toolbar/remote_$${icon}_16.png >> $@ ;\
+       done
+
 EXTRA_DIST = \
+       $(GENERATOR_FILES)      \
        airpcap_dlg.c                   \
        airpcap_gui_utils.c             \
        capture_if_details_dlg_win32.c  \
        capture_if_details_dlg_win32.h  \
        doxygen.cfg.in                  \
-       file_dlg_win32.c                \
-       file_dlg_win32.h                \
        libui.vcproj                    \
        main_airpcap_toolbar.c          \
        Makefile.common                 \
        Makefile.nmake                  \
-       print_win32.c                   \
-       print_win32.h                   \
-       CMakeLists.txt
+       CMakeLists.txt                  \
+       Makefile_custom.common