osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2012-03-19 09:31:22 +00:00
parent e0b738f974
commit ec2451f8f1
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/qt/Makefile.am
View File

@ -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)

7
ui/qt/Makefile.common
View File

@ -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 =