update Makefiles so Makedist works correctly

git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@57 fba4d07e-fe0f-4d7f-8147-e0026e666dc0

7 files changed, 36 insertions, 138 deletions

diff --git a/Makefile.am b/Makefile.am
index a390faf..b61a372 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST =
+EXTRA_DIST = cookey.spec LICENSE
 
 DISTCLEANFILES = 
 
diff --git a/Makefile.in b/Makefile.in
index b073410..1870322 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -126,6 +126,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -166,13 +167,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -189,23 +186,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -216,7 +220,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = src/libckyapplet src/coolkey $(am__append_1)
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = 
+EXTRA_DIST = cookey.spec LICENSE
 DISTCLEANFILES = 
 AUTOMAKE_OPTIONS = foreign
 all: config.h
diff --git a/src/coolkey/Makefile.am b/src/coolkey/Makefile.am
index eae2bec..e465329 100644
--- a/src/coolkey/Makefile.am
+++ b/src/coolkey/Makefile.am
@@ -21,7 +21,7 @@
 
 SUBDIRS = 
 AM_CPP_FLAGS =
-EXTRA_DIST = coolkeypk11.def
+EXTRA_DIST = coolkeypk11.def coolkeypk11.rc
 if IS_WINDOWS
 pkcs11dir = $(libdir)
 else
diff --git a/src/coolkey/Makefile.in b/src/coolkey/Makefile.in
index 3a65253..6ea1751 100644
--- a/src/coolkey/Makefile.in
+++ b/src/coolkey/Makefile.in
@@ -146,6 +146,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -186,13 +187,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -209,23 +206,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -236,7 +240,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CPP_FLAGS = 
-EXTRA_DIST = coolkeypk11.def
+EXTRA_DIST = coolkeypk11.def coolkeypk11.rc
 @IS_WINDOWS_FALSE@pkcs11dir = $(libdir)/pkcs11
 @IS_WINDOWS_TRUE@pkcs11dir = $(libdir)
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
diff --git a/src/coolkey/test.cpp b/src/coolkey/test.cpp
deleted file mode 100644
index b0c3aed..0000000
--- a/src/coolkey/test.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/* ***** BEGIN COPYRIGHT BLOCK *****
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version
- * 2.1 of the License.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- * ***** END COPYRIGHT BLOCK *****/
-
-#include "list.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <list>
-#include <string>
-
-using std::list;
-using std::string;
-
-void*
-operator new(unsigned int len)
-{
-    void* p = malloc(len);
-    printf("operator new(%d) returns 0x%08x\n", len, p);
-    return p;
-}
-
-void
-operator delete(void *p)
-{
-    printf("operator delete(0x%08x)\n", p);
-}
-
-void
-mylist()
-{
-    List<int> intlist;
-
-    List<int>::Iterator iter;
-
-    iter = intlist.begin();
-
-    intlist.insert(iter, 5);
-
-    iter++;
-
-    intlist.insert(iter, 7);
-
-    iter = intlist.find_item(intlist.begin(), intlist.end(), 7);
-
-    intlist.insert(iter, 9);
-
-
-    List<string> stringlist;
-
-    List<string>::Iterator siter;
-
-    siter = stringlist.begin();
-
-    string bob("hello, world");
-    bob += "5";
-    stringlist.insert(siter, bob);
-
-    siter = stringlist.begin();
-
-    string boo = *siter;
-
-    printf("boo is %s\n", boo.c_str());
-
-    stringlist.remove(siter);
-
-}
-
-void
-stllist()
-{
-    list<int> intlist;
-
-    std::list<int>::iterator iter;
-
-    iter = intlist.begin();
-
-    intlist.insert(iter, 5);
-
-    iter++;
-
-    intlist.insert(iter, 7);
-
-    intlist.insert(iter, 9);
-
-
-    list<string> stringlist;
-    std::list<string>::iterator siter;
-    siter = stringlist.begin();
-    stringlist.insert(siter, "hello, world");
-
-}
-
-int
-main(int argc, char *argv[])
-{
-    printf("Doing mylist\n");
-    mylist();
-    printf("Doing stllist\n");
-    stllist();
-    return 0;
-}
-
diff --git a/src/install/Makefile.in b/src/install/Makefile.in
index 4aee6a2..8dfb608 100644
--- a/src/install/Makefile.in
+++ b/src/install/Makefile.in
@@ -123,6 +123,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -163,13 +164,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -186,23 +183,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
diff --git a/src/libckyapplet/Makefile.in b/src/libckyapplet/Makefile.in
index d2b250a..b517d69 100644
--- a/src/libckyapplet/Makefile.in
+++ b/src/libckyapplet/Makefile.in
@@ -145,6 +145,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+GREP = @GREP@
 HAVE_PCSC_FALSE = @HAVE_PCSC_FALSE@
 HAVE_PCSC_TRUE = @HAVE_PCSC_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
@@ -185,13 +186,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -208,23 +205,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@