diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-03-19 09:31:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-03-19 09:31:22 +0000 |
| commit | ec2451f8f195a11c812548637700346850b8414a (patch) | |
| tree | 146a19fdcf1ca7da22ade02c195f0a383c1baee8 /ui/qt | |
| parent | e0b738f974e76ed18a8aaefebbcf68cab39e07b1 (diff) | |
We don't use a GENERATED_H_FILES macro anywhere else, we use
GENERATED_HEADER_FILES; get rid of GENERATED_H_FILES in favor of
GENERATED_HEADER_FILES, and make other changes to make the Makefile.am
and Makefile.common in ui/qt more like those in ui/gtk.
svn path=/trunk/; revision=41669
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/Makefile.am | 6 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 1edcba2bb6..a47e37f635 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -46,16 +46,16 @@ RUNLEX=$(top_srcdir)/tools/runlex.sh libqtui_a_SOURCES = \ $(WIRESHARK_QT_SRC) \ + $(WIRESHARK_TAP_SRC) \ $(GENERATED_C_FILES) \ $(GENERATED_CPP_FILES) \ - $(GENERATED_H_FILES) \ $(noinst_HEADERS) \ - $(WIRESHARK_TAP_SRC) + $(GENERATED_HEADER_FILES) nodist_libqtui_a_SOURCES = \ $(GENERATED_NODIST_C_FILES) \ $(GENERATED_NODIST_CPP_FILES) \ - $(GENERATED_NODIST_H_FILES) + $(GENERATED_NODIST_HEADER_FILES) libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 9d17cea89d..12c5ec7f48 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -49,23 +49,18 @@ GENERATED_NODIST_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) \ $(GENERATED_C_FILES) \ $(GENERATED_CPP_FILES) \ - $(GENERATED_H_FILES) \ $(DIRTY_GENERATED_C_FILES) # All the generated files we don't want in the distribution. GENERATED_NODIST_FILES = \ $(GENERATED_NODIST_HEADER_FILES) \ $(GENERATED_NODIST_C_FILES) \ - $(GENERATED_NODIST_CPP_FILES) \ - $(GENERATED_NODIST_H_FILES) + $(GENERATED_NODIST_CPP_FILES) # Files that generate compileable files GENERATOR_FILES = |