build: include to 'dist' the files used by Windows build

This commit is contained in:
Viktor Tarasov 2012-09-11 17:13:39 +02:00
parent 58b4304957
commit 961059a052
3 changed files with 13 additions and 11 deletions

View File

@ -1,10 +1,12 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc.conf.win
DISTCLEANFILES = opensc.conf DISTCLEANFILES = opensc.conf opensc.conf.win
EXTRA_DIST = Makefile.mak
SUFFIXES = .in SUFFIXES = .in
dist_noinst_DATA = opensc.conf.in dist_noinst_DATA = opensc.conf.in opensc.conf.win.in
nodist_noinst_DATA = opensc.conf # For Windows MSVC build nodist_noinst_DATA = opensc.conf opensc.conf.win # For Windows MSVC build
# Make sure we build this every time # Make sure we build this every time
# as there is no dependency for this. # as there is no dependency for this.

View File

@ -1,8 +1,8 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
$(srcdir)/versioninfo.rc $(srcdir)/winconfig.h $(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf
EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \ EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in
dist_noinst_HEADERS = versioninfo.rc winconfig.h dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico
if WIN32 if WIN32
sbin_SCRIPTS = opensc-install.bat sbin_SCRIPTS = opensc-install.bat

View File

@ -29,7 +29,7 @@
#ifndef strnicmp #ifndef strnicmp
#define strnicmp _strnicmp #define strnicmp _strnicmp
#endif #endif
#ifndef stricmp #ifndef stricmp
#define stricmp _stricmp #define stricmp _stricmp
@ -66,11 +66,11 @@
#define F_OK 0 /* test whether exist. */ #define F_OK 0 /* test whether exist. */
#endif #endif
#ifndef S_IRUSR #ifndef S_IRUSR
#define S_IRUSR S_IREAD #define S_IRUSR S_IREAD
#endif #endif
#ifndef S_IWUSR #ifndef S_IWUSR
#define S_IWUSR S_IWRITE #define S_IWUSR S_IWRITE
#endif #endif
@ -79,7 +79,7 @@
#define HAVE_WINSCARD_H #define HAVE_WINSCARD_H
#define DEFAULT_PCSC_PROVIDER "winscard.dll" #define DEFAULT_PCSC_PROVIDER "winscard.dll"
#define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC\\profiles" #define SC_PKCS15_PROFILE_DIRECTORY "C:\\Program Files\\OpenSC Project\\OpenSC\\profiles"
#define PATH_MAX FILENAME_MAX #define PATH_MAX FILENAME_MAX