aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/Makefile.am
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-10-18 18:28:57 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-10-18 18:28:57 +0000
commitd69a93f70ed185f1183c467584e41576941dbddd (patch)
treefa288163d0f7a49dcf7119a3c43b3b3b8118d54f /ui/qt/Makefile.am
parent2322bd31228d667607ef819b499ce8d7dddb364a (diff)
Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS. Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.
svn path=/trunk/; revision=52676
Diffstat (limited to 'ui/qt/Makefile.am')
-rw-r--r--ui/qt/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index 01dedffd09..aaf10b2dd1 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -63,8 +63,9 @@ libqtui_a_DEPENDENCIES =
# Common headers
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
- $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS) $(AM_CLEAN_CFLAGS) \
- $(CXX_NO_SHORTEN_WARNING_FLAGS)
+ $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
+
+AM_CXXFLAGS = $(AM_CLEAN_CFLAGS)
AM_V_MOC = $(am__v_MOC_@AM_V@)
am__v_MOC_ = $(am__v_MOC_@AM_DEFAULT_V@)