- 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

@@ -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
 

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)