osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't distribute the output of various Qt preprocessing tools. We don't 

want to require the machines used to build the distribution tarballs to
have those tools installed or to require the build process to run them,
and I think if you have enough stuff installed to build Qt applications
at all you'll have those tools installed (the reason why the result of
{F}lex and YACC/BYACC/Bison are distributed with tarballs is to let
somebody who wants to or needs to build from unmodified source do so
with as few tools required as possible).

svn path=/trunk/; revision=41666
This commit is contained in:
Guy Harris 2012-03-19 07:30:38 +00:00
parent 73ca54d870
commit c2f03d39f3
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/qt/Makefile.am
View File

@ -35,7 +35,8 @@ CLEANFILES = \
*~
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
$(GENERATED_FILES) \
$(GENERATED_NODIST_FILES) \
Makefile.in
RUNLEX=$(top_srcdir)/tools/runlex.sh
@ -43,10 +44,16 @@ RUNLEX=$(top_srcdir)/tools/runlex.sh
libqtui_a_SOURCES = \
$(WIRESHARK_QT_SRC) \
$(GENERATED_C_FILES) \
$(GENERATED_CPP_FILES) \
$(GENERATED_H_FILES) \
$(noinst_HEADERS) \
$(WIRESHARK_TAP_SRC)
nodist_libqtui_a_SOURCES = \
$(GENERATED_NODIST_C_FILES) \
$(GENERATED_NODIST_CPP_FILES) \
$(GENERATED_NODIST_H_FILES)
libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS)
libqtui_a_DEPENDENCIES =

21
ui/qt/Makefile.common
View File

@ -27,7 +27,10 @@
include Makefile_custom.common
# Generated header files that we want in the distribution.
GENERATED_HEADER_FILES = \
GENERATED_HEADER_FILES =
# Generated header files that we don't want in the distribution.
GENERATED_NODIST_HEADER_FILES = \
ui_main_window.h
# Generated C source files that we want in the distribution.
@ -35,8 +38,14 @@ GENERATED_C_FILES =
DIRTY_GENERATED_C_FILES =
# Generated C source files that we don't want in the distribution.
GENERATED_NODIST_C_FILES =
# Generated C++ source files that we want in the distribution.
GENERATED_CPP_FILES = \
GENERATED_CPP_FILES =
# Generated C++ source files that we don't want in the distribution.
GENERATED_NODIST_CPP_FILES = \
$(MOC_SRC) \
$(QRC_SRC)
@ -47,9 +56,17 @@ GENERATED_H_FILES =
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)
# Files that generate compileable files
GENERATOR_FILES =