From c693c4799c69814f7a3c7756b0c9c626436b16d5 Mon Sep 17 00:00:00 2001 From: aet Date: Thu, 23 Oct 2003 09:12:48 +0000 Subject: [PATCH] - Merging between Makefile.am<>Makefile.mak - Add ui.h to main distribution tarball, snapshots have been broken for a few days git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1566 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/Makefile.am | 4 ++-- src/libopensc/Makefile.mak | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 55de0ff5..5879d878 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -33,8 +33,8 @@ libopensc_la_LIBADD = @LIBSCCONF@ ../scdl/libscdl.la @LIBDL@ @LIBCRYPTO@ @OPENCT include_HEADERS = \ opensc.h pkcs15.h emv.h \ - errors.h types.h \ - cardctl.h asn1.h log.h + cardctl.h asn1.h log.h ui.h \ + errors.h types.h noinst_HEADERS = ctbcs.h internal.h diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak index d9f39a45..a92d3f6a 100644 --- a/src/libopensc/Makefile.mak +++ b/src/libopensc/Makefile.mak @@ -3,15 +3,15 @@ TOPDIR = ..\.. TARGET = opensc.dll -HEADERS = opensc.h pkcs15.h emv.h \ - errors.h types.h \ - cardctl.h asn1.h log.h \ - ui.h +HEADERS = \ + opensc.h pkcs15.h emv.h \ + cardctl.h asn1.h log.h ui.h \ + errors.h types.h HEADERSDIR = $(TOPDIR)\src\include\opensc OBJECTS = \ - sc.obj ctx.obj log.obj errors.obj portability.obj module.obj \ + sc.obj ctx.obj ui.obj log.obj errors.obj portability.obj module.obj \ asn1.obj base64.obj sec.obj card.obj iso7816.obj dir.obj padding.obj \ \ pkcs15.obj pkcs15-cert.obj pkcs15-data.obj pkcs15-pin.obj \ @@ -26,8 +26,6 @@ OBJECTS = \ card-etoken.obj card-tcos.obj card-emv.obj card-default.obj \ card-mcrd.obj card-starcos.obj \ \ - ui.obj \ - \ $(TOPDIR)\win32\version.res all: install-headers $(TARGET)