diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-03-19 06:29:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-03-19 06:29:41 +0000 |
| commit | 1ff3d8477f11d39e9b1b4ca93bce72e1cce60ac9 (patch) | |
| tree | 8398a76fdab4e960b4a2cffba027bd592f56699c /ui/qt | |
| parent | 406e66d3bf8f0d2457e5329d6df81a77091a0be3 (diff) | |
Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.
List the moc-generated and rcc-generated files as generated files.
Add main_window.ui as an EXTRA_DIST file. Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41658
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/Makefile.am | 20 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 12 |
2 files changed, 19 insertions, 13 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index bbb8fc966a..bd45b19892 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -28,10 +28,10 @@ if HAVE_WARNINGS_AS_ERRORS AM_CLEAN_CFLAGS = -Werror endif -noinst_LIBRARIES = libui.a +noinst_LIBRARIES = libqtui.a CLEANFILES = \ - libui.a \ + libqtui.a \ *~ MAINTAINERCLEANFILES = \ @@ -40,16 +40,16 @@ MAINTAINERCLEANFILES = \ RUNLEX=$(top_srcdir)/tools/runlex.sh -libui_a_SOURCES = \ +libqtui_a_SOURCES = \ $(WIRESHARK_QT_SRC) \ $(GENERATED_C_FILES) \ $(GENERATED_H_FILES) \ $(noinst_HEADERS) \ $(WIRESHARK_TAP_SRC) -libui_a_CFLAGS = $(AM_CLEAN_CFLAGS) +libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS) -libui_a_DEPENDENCIES = +libqtui_a_DEPENDENCIES = # Common headers AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) @@ -112,11 +112,13 @@ remote_icons.h: done # XXX to be created -# libui.vcproj +# libqtui.vcproj +# Makefile.nmake EXTRA_DIST = \ $(GENERATOR_FILES) \ + CMakeLists.txt \ doxygen.cfg.in \ Makefile.common \ - Makefile.nmake \ - CMakeLists.txt \ - Makefile_custom.common + Makefile_custom.common \ + main_window.ui + diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 8ac356a03e..3c09d80c37 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -32,10 +32,16 @@ GENERATED_HEADER_FILES = # Generated C source files that we want in the distribution. GENERATED_C_FILES = -GENERATED_H_FILES = - DIRTY_GENERATED_C_FILES = +# Generated C++ source files that we want in the distribution. +GENERATED_CPP_FILES = \ + $(MOC_SRC) \ + $(QRC_SRC) + +# Generated headers that we want in the distribution. +GENERATED_H_FILES = + # All the generated files we want in the distribution. GENERATED_FILES = \ $(GENERATED_HEADER_FILES) \ @@ -100,8 +106,6 @@ QRC_FILES = \ QRC_SRC = $(QRC_FILES:.qrc=.rcc.cpp) WIRESHARK_QT_SRC = \ - $(MOC_SRC) \ - $(QRC_SRC) \ byte_view_tab.cpp \ byte_view_text.cpp \ capture_file_dialog.cpp \ |