Update Makefiles generated by automake to support windows install

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

5 files changed, 17 insertions, 19 deletions

diff --git a/Makefile.in b/Makefile.in
index 48cec20..b073410 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,6 +132,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
diff --git a/configure.in b/configure.in
index e73ddf5..5a7771a 100644
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,7 @@ AC_SUBST(PCSC_LIBS)
 AC_SUBST(SCARD_LIB_NAME)
 AM_CONDITIONAL(HAVE_PCSC, test x$with_pcsclite = xyes)
 AM_CONDITIONAL(BUILD_PK11INSTALL, test x$enable_pk11install = xyes)
+AM_CONDITIONAL(IS_WINDOWS, test $WINDOWS -eq 1)
 
 AC_DEFINE(DEBUG, 1, [Define to 1 if you want to include debugging code.])
 # Checks for header files.
diff --git a/src/coolkey/Makefile.in b/src/coolkey/Makefile.in
index 908371b..3a65253 100644
--- a/src/coolkey/Makefile.in
+++ b/src/coolkey/Makefile.in
@@ -152,6 +152,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
@@ -235,7 +237,8 @@ target_vendor = @target_vendor@
 SUBDIRS = 
 AM_CPP_FLAGS = 
 EXTRA_DIST = coolkeypk11.def
-pkcs11dir = $(libdir)/pkcs11
+@IS_WINDOWS_FALSE@pkcs11dir = $(libdir)/pkcs11
+@IS_WINDOWS_TRUE@pkcs11dir = $(libdir)
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 libcoolkeypk11_la_SOURCES = \
 	coolkey.cpp \
@@ -720,22 +723,9 @@ clean-generic:
 install-data-hook:
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
-
-#MODULE = coolkeypk11
-#REQUIRES = ckyapplet zlib
-#USE_STATIC_RTL=1
-
-#BASE_LIBRARY_NAME = coolkeypk11
-#LIBRARY_NAME = $(BASE_LIBRARY_NAME)
-#MAPFILE = $(OBJDIR)/coolkeypk11.def
-
-#DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \
-# -DPKCS11_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
-#DEFINES += -DNSS_HIDE_NONSTANDARD_OBJECTS=1
-
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libcoolkey.pc
+@IS_WINDOWS_TRUE@	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib
+@IS_WINDOWS_TRUE@	mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll
+@IS_WINDOWS_TRUE@	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/install/Makefile.in b/src/install/Makefile.in
index a9ab630..4aee6a2 100644
--- a/src/install/Makefile.in
+++ b/src/install/Makefile.in
@@ -129,6 +129,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
diff --git a/src/libckyapplet/Makefile.in b/src/libckyapplet/Makefile.in
index f2254b3..d2b250a 100644
--- a/src/libckyapplet/Makefile.in
+++ b/src/libckyapplet/Makefile.in
@@ -151,6 +151,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS_WINDOWS_FALSE = @IS_WINDOWS_FALSE@
+IS_WINDOWS_TRUE = @IS_WINDOWS_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBCKYAPPLET = @LIBCKYAPPLET@
 LIBOBJS = @LIBOBJS@
@@ -264,8 +266,8 @@ noinst_HEADERS = \
 	cky_basei.h \
 	dynlink.h 
 
-pcdir = $(libdir)/pkgconfig
-pc_DATA = libckyapplet.pc
+@IS_WINDOWS_FALSE@pcdir = $(libdir)/pkgconfig
+@IS_WINDOWS_FALSE@pc_DATA = libckyapplet.pc
 all: all-recursive
 
 .SUFFIXES:
@@ -729,6 +731,7 @@ uninstall-info: uninstall-info-recursive
 install-data-hook:
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.a
 	rm -f $(DESTDIR)$(libdir)/libckyapplet.la
+@IS_WINDOWS_TRUE@	rm -f $(DESTDIR)$(libdir)/libckyapplet.lib
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: