From 65d085ffcc4ce9eb8022870be746e282a08bf6a0 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Fri, 13 Mar 2009 20:21:31 -0400
Subject: [PATCH] I messed up the directory tree making it hard to pull changes
 from the v5.0.x branch. So this is a temporary commit to move src/* to the
 root tree so pulling in changes is possible. There is probably a better way
 to do this, but I don't know of it.

---
 src/Makefile.am => Makefile.am   | 27 +++++++++++++++++++++++++++
 configure.ac                     |  4 ++--
 src/gettext.h => gettext.h       |  0
 src/libpwmd.c => libpwmd.c       |  0
 src/libpwmd.h.in => libpwmd.h.in |  0
 src/mem.c => mem.c               |  0
 src/mem.h => mem.h               |  0
 po/POTFILES.in                   |  6 +++---
 src/pwmc.c => pwmc.c             |  0
 src/types.h => types.h           |  0
 10 files changed, 32 insertions(+), 5 deletions(-)
 rename src/Makefile.am => Makefile.am (65%)
 rename src/gettext.h => gettext.h (100%)
 rename src/libpwmd.c => libpwmd.c (100%)
 rename src/libpwmd.h.in => libpwmd.h.in (100%)
 rename src/mem.c => mem.c (100%)
 rename src/mem.h => mem.h (100%)
 rename src/pwmc.c => pwmc.c (100%)
 rename src/types.h => types.h (100%)

diff --git a/src/Makefile.am b/Makefile.am
similarity index 65%
rename from src/Makefile.am
rename to Makefile.am
index 0447832d..18546ee9 100644
--- a/src/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,30 @@
+EXTRA_DIST = TODO ChangeLog ChangeLog.old INSTALL KnownBugs NEWS debian \
+	     ABOUT-NLS
+SUBDIRS = doc assuan src po
+ACLOCAL_AMFLAGS = -I m4 -I/usr/local/share/aclocal
+
+install-data-hook:
+	install -m 0755 -d $(DESTDIR)${libdir}/pkgconfig
+	chmod u+w $(DESTDIR)${libdir}/pkgconfig
+	install -p -m 0644 ${top_builddir}/libpwmd.pc $(DESTDIR)${libdir}/pkgconfig
+if WITH_LIBPTH
+	install -p -m 0644 ${top_builddir}/libpwmd-pth.pc $(DESTDIR)${libdir}/pkgconfig
+endif
+
+uninstall-hook:
+	rm -f $(DESTDIR)${libdir}/pkgconfig/libpwmd.pc
+	rm -f $(DESTDIR)${libdir}/pkgconfig/libpwmd-pth.pc
+
+changelog:
+	git-log --no-color > ChangeLog || exit 1
+
+deb: changelog
+	dpkg-buildpackage -B -uc -rfakeroot && dh_clean
+
+version: changelog
+	$(MAKE) $(AM_MAKEFLAGS) distcheck
+	$(MAKE) $(AM_MAKEFLAGS) deb
+
 DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir)/assuan
 
 lib_LTLIBRARIES = libpwmd.la
diff --git a/configure.ac b/configure.ac
index 185b66d0..09cb26b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE([foreign])
 AC_PROG_MAKE_SET
 #AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
-AC_CONFIG_SRCDIR([src/libpwmd.c])
+AC_CONFIG_SRCDIR([libpwmd.c])
 AM_CONFIG_HEADER([config.h])
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.16.1])
@@ -109,6 +109,6 @@ AC_DEFINE_UNQUOTED(PINENTRY_PATH, ["$pinentry"],
 		   [Default location of the pinentry binary.])
 
 AC_CONFIG_FILES([Makefile libpwmd.pc libpwmd-pth.pc doc/Makefile \
-		 doc/libpwmd.3 doc/pwmc.1 src/Makefile src/libpwmd.h \
+		 doc/libpwmd.3 doc/pwmc.1 libpwmd.h \
 		 po/Makefile.in])
 AC_OUTPUT
diff --git a/src/gettext.h b/gettext.h
similarity index 100%
rename from src/gettext.h
rename to gettext.h
diff --git a/src/libpwmd.c b/libpwmd.c
similarity index 100%
rename from src/libpwmd.c
rename to libpwmd.c
diff --git a/src/libpwmd.h.in b/libpwmd.h.in
similarity index 100%
rename from src/libpwmd.h.in
rename to libpwmd.h.in
diff --git a/src/mem.c b/mem.c
similarity index 100%
rename from src/mem.c
rename to mem.c
diff --git a/src/mem.h b/mem.h
similarity index 100%
rename from src/mem.h
rename to mem.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3c687ca0..c292ca48 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
 # List of source files which contain translatable strings.
-src/libpwmd.c
-src/mem.c
-src/pwmc.c
+libpwmd.c
+mem.c
+pwmc.c
diff --git a/src/pwmc.c b/pwmc.c
similarity index 100%
rename from src/pwmc.c
rename to pwmc.c
diff --git a/src/types.h b/types.h
similarity index 100%
rename from src/types.h
rename to types.h
-- 
2.11.4.GIT