Get rid of the include/ directory.
authorWerner Koch <wk@gnupg.org>
Mon, 1 Jul 2013 12:02:15 +0000 (14:02 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 1 Jul 2013 12:49:52 +0000 (14:49 +0200)
* include/config.nsi.in: Move to src/
* include/Makefile.am: Remove.
* include/: Remove.
* src/Makefile.am (EXTRA_DIST): Add config.nsi.
* Makefile.am (SUBDIRS): Remove "include".
* configure.ac (AC_CONFIG_FILES): Remove include/Makefile.am.
Add src/config.nsi.
* src/gpg4win-src.nsi, src/gpg4win.nsi: Adjust include directive for
config.nsi.
--

A separate include directory does not make sense and is often gets in
the way when grepping for things.

.gitignore
Makefile.am
configure.ac
include/Makefile.am [deleted file]
src/Makefile.am
src/config.nsi.in [moved from include/config.nsi.in with 100% similarity]
src/gpg4win-src.nsi
src/gpg4win.nsi

index 6a2a10d..38cf6ba 100644 (file)
@@ -14,7 +14,7 @@ stamp-h1
 /*.tar.bz2
 /gpg4win-2.*
 doc/manual/version.tex
-include/config.nsi
+src/config.nsi
 po/POTFILES
 po/*.nsi
 po/gpg4win.pot
index 830e17d..d422902 100644 (file)
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --host=i686-w64-mingw32
 
-SUBDIRS = po packages include doc src
+SUBDIRS = po packages doc src
 
 EXTRA_DIST = autogen.sh README.GIT ONEWS \
         build-aux/git-log-footer build-aux/git-log-fix \
index 0fcd94a..ed7f770 100644 (file)
@@ -69,7 +69,7 @@ GIT_REVISION=git_revision
 GIT_REVISION_DEC=git_revision_dec
 
 
-AC_CONFIG_SRCDIR(include/config.nsi.in)
+AC_CONFIG_SRCDIR(src/config.nsi.in)
 AC_CONFIG_MACRO_DIR(m4)
 
 AM_INIT_AUTOMAKE([tar-ustar])
@@ -440,9 +440,9 @@ chmod +x patches/gnupg2/01-version.patch
 ]])
 
 AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(packages/Makefile include/Makefile src/Makefile po/Makefile.in)
+AC_CONFIG_FILES(packages/Makefile src/Makefile po/Makefile.in)
 AC_CONFIG_FILES(po/build-cc)
-AC_CONFIG_FILES(include/config.nsi src/gpg4win.mk)
+AC_CONFIG_FILES(src/config.nsi src/gpg4win.mk)
 AC_CONFIG_FILES(doc/Makefile)
 AC_CONFIG_FILES(doc/logo/Makefile)
 AC_CONFIG_FILES(doc/manual/Makefile doc/manual/version.tex)
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644 (file)
index 02cccec..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile.am - Installer for GnuPG 4 Windows Makefile.
-# Copyright (C) 2005 g10 Code GmbH
-# 
-# This file is part of GPG4Win.
-# 
-# GPG4Win is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# GPG4Win 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-EXTRA_DIST = config.nsi.in
index 77ff1f4..119dc4c 100644 (file)
@@ -17,7 +17,8 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
-EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi config.site \
+EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
+       config.site config.nsi.in \
         installer-options.ini.in libiconv.def libintl.def loreley.mid \
         gpg4win-splash.wav gpgwrap.c exdll.h g4wihelp.c g4wihelp.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
similarity index 100%
rename from include/config.nsi.in
rename to src/config.nsi.in
index 801f556..f7842b8 100644 (file)
@@ -22,7 +22,7 @@
 !addincludedir "${TOP_SRCDIR}/po"
 !addincludedir "${SRCDIR}"
 !addplugindir "${BUILD_DIR}"
-!include "../include/config.nsi"
+!include "config.nsi"
 
 # We need StrRep.
 !include "StrFunc.nsh"
index bb07951..d69468b 100644 (file)
@@ -22,7 +22,7 @@
 !addincludedir "${TOP_SRCDIR}/po"
 !addincludedir "${SRCDIR}"
 !addplugindir "${BUILD_DIR}"
-!include "../include/config.nsi"
+!include "config.nsi"
 
 # For the "light" version of the package, we explicitely disable some
 # of the packages right after including config.nsi.