diff options
| author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-16 19:50:56 +0000 |
|---|---|---|
| committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-16 19:50:56 +0000 |
| commit | 9d054758fc736e4333b0d01d325e52b1c834677d (patch) | |
| tree | e3cace435944b6a593421c85c79e56d8234b9763 /src | |
| parent | 25a696b782b1dfea7e2a833bef03b7497c19a4d7 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/coolkey/Makefile.in | 24 | ||||
| -rw-r--r-- | src/install/Makefile.in | 2 | ||||
| -rw-r--r-- | src/libckyapplet/Makefile.in | 7 |
3 files changed, 14 insertions, 19 deletions
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: |