diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-02-09 23:35:30 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-02-09 23:35:30 +0000 |
| commit | a13d58a509ebb60a6cf1991be902234f97280ce6 (patch) | |
| tree | 3fdf186720e45f24658bcf0323a9f7801378c88f /ui | |
| parent | 233fcd672fa3075416df494d79fd702f2d28486e (diff) | |
| download | wireshark-a13d58a509ebb60a6cf1991be902234f97280ce6.tar.gz | |
Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.
svn path=/trunk/; revision=47599
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/Makefile.am | 10 | ||||
| -rw-r--r-- | ui/qt/Makefile.common | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index cbc349f31b..c6ff4f8eb3 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -35,11 +35,11 @@ CLEANFILES = \ *~ DISTCLEANFILES = \ - $(GENERATED_NODIST_FILES) + $(NODIST_GENERATED_FILES) MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ - $(GENERATED_NODIST_FILES) \ + $(NODIST_GENERATED_FILES) \ Makefile.in RUNLEX=$(top_srcdir)/tools/runlex.sh @@ -53,9 +53,9 @@ libqtui_a_SOURCES = \ $(GENERATED_HEADER_FILES) nodist_libqtui_a_SOURCES = \ - $(GENERATED_NODIST_C_FILES) \ - $(GENERATED_NODIST_CPP_FILES) \ - $(GENERATED_NODIST_HEADER_FILES) + $(NODIST_GENERATED_C_FILES) \ + $(NODIST_GENERATED_CPP_FILES) \ + $(NODIST_GENERATED_HEADER_FILES) libqtui_a_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 49b5e20f3f..283229bc04 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -30,7 +30,7 @@ include Makefile_custom.common GENERATED_HEADER_FILES = # Generated header files that we don't want in the distribution. -GENERATED_NODIST_HEADER_FILES = \ +NODIST_GENERATED_HEADER_FILES = \ ui_capture_preferences_frame.h \ ui_column_preferences_frame.h \ ui_export_object_dialog.h \ @@ -57,13 +57,13 @@ GENERATED_NODIST_HEADER_FILES = \ GENERATED_C_FILES = # Generated C source files that we don't want in the distribution. -GENERATED_NODIST_C_FILES = +NODIST_GENERATED_C_FILES = # Generated C++ source files that we want in the distribution. GENERATED_CPP_FILES = # Generated C++ source files that we don't want in the distribution. -GENERATED_NODIST_CPP_FILES = \ +NODIST_GENERATED_CPP_FILES = \ $(MOC_SRC) \ $(QRC_SRC) @@ -74,10 +74,10 @@ GENERATED_FILES = \ $(GENERATED_CPP_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) +NODIST_GENERATED_FILES = \ + $(NODIST_GENERATED_HEADER_FILES) \ + $(NODIST_GENERATED_C_FILES) \ + $(NODIST_GENERATED_CPP_FILES) # Files that generate compileable files GENERATOR_FILES = |