summaryrefslogtreecommitdiffstats
path: root/am/cmacros.am
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-02-04 12:57:53 +0100
committerWerner Koch <wk@gnupg.org>2011-02-04 12:57:53 +0100
commitb008274afdbe375b32a7e66dbd073e200f6f0587 (patch)
tree219e239d39cf06be3f03aa82fb572080ac163a15 /am/cmacros.am
parentLet autogen.sh check the git config (diff)
downloadgnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.xz
gnupg2-b008274afdbe375b32a7e66dbd073e200f6f0587.zip
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future commits with diffs of trailing white spaces. In the majority of cases blank or single lines are affected and thus this change won't disturb a git blame too much. For future commits the pre-commit scripts checks that this won't happen again.
Diffstat (limited to 'am/cmacros.am')
-rw-r--r--am/cmacros.am13
1 files changed, 6 insertions, 7 deletions
diff --git a/am/cmacros.am b/am/cmacros.am
index da34eb7ed..51f47c373 100644
--- a/am/cmacros.am
+++ b/am/cmacros.am
@@ -7,18 +7,18 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
localedir = $(datadir)/locale
-AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS += -DLOCALEDIR=\"$(localedir)\"
if ! HAVE_DOSISH_SYSTEM
AM_CPPFLAGS += -DGNUPG_BINDIR="\"$(bindir)\"" \
@@ -59,14 +59,13 @@ endif
# we use with pth.
if HAVE_W32CE_SYSTEM
extra_sys_libs = -lcoredll6
-extra_bin_ldflags = -Wl,--stack=0x40000
+extra_bin_ldflags = -Wl,--stack=0x40000
else
-extra_sys_libs =
-extra_bin_ldflags =
+extra_sys_libs =
+extra_bin_ldflags =
endif
# Convenience macros
libcommon = ../common/libcommon.a
libcommonpth = ../common/libcommonpth.a
-