diff options
author | Alon Levy <alevy@redhat.com> | 2010-09-15 15:55:37 +0200 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2010-12-07 13:31:44 +0200 |
commit | 7e0a1dfa75d9c967b96929c56dce4cecb7151a85 (patch) | |
tree | 4ec0b7cd9442d8353878f10007bf3c3c629dbc9f /client | |
parent | d99ec6c35b02a64950c4397644a9a81fad1d4492 (diff) | |
download | spice-7e0a1dfa75d9c967b96929c56dce4cecb7151a85.tar.gz spice-7e0a1dfa75d9c967b96929c56dce4cecb7151a85.tar.xz spice-7e0a1dfa75d9c967b96929c56dce4cecb7151a85.zip |
smartcard: configure option --enable-smartcard
Diffstat (limited to 'client')
-rw-r--r-- | client/Makefile.am | 8 | ||||
-rw-r--r-- | client/x11/Makefile.am | 9 |
2 files changed, 16 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 5a14f5fd..166ce5e9 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -28,6 +28,12 @@ else GL_SRCS = endif +if SUPPORT_SMARTCARD +SMARTCARD_SRCS = smartcard_channel.cpp +else +SMARTCARD_SRCS = +endif + RED_COMMON_SRCS = \ application.cpp \ application.h \ @@ -134,6 +140,6 @@ GDI_FILES = \ MAINTAINERCLEANFILES = $(spice_built_sources) -EXTRA_DIST = $(RED_COMMON_SRCS) $(spice_built_sources) $(GL_SRCS) $(GDI_FILES) +EXTRA_DIST = $(RED_COMMON_SRCS) $(spice_built_sources) $(GL_SRCS) $(GDI_FILES) $(SMARTCARD_SRCS) BUILT_SOURCES = $(spice_built_sources) diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 45ff7fcb..42b8b0ab 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -27,6 +27,7 @@ INCLUDES = \ $(CEGUI_CFLAGS) \ $(WARN_CFLAGS) \ $(SPICE_NONPKGCONFIG_CFLAGS) \ + $(SMARTCARD_CFLAGS) \ $(NULL) @@ -158,6 +159,12 @@ else RED_OGL_SRCS = endif +if SUPPORT_SMARTCARD +RED_SCARD_SRCS = $(CLIENT_DIR)/smartcard_channel.cpp +else +RED_SCARD_SRCS = +endif + bin_PROGRAMS = spicec spicec_SOURCES = \ @@ -191,6 +198,7 @@ spicec_SOURCES = \ $(RED_GUI_SRCS) \ $(RED_TUNNEL_SRCS) \ $(RED_OGL_SRCS) \ + $(RED_SCARD_SRCS) \ $(NULL) spicec_LDFLAGS = \ @@ -200,6 +208,7 @@ spicec_LDFLAGS = \ $(CEGUI_LIBS) \ $(JPEG_LIBS) \ $(Z_LIBS) \ + $(SMARTCARD_LIBS) \ $(SPICE_NONPKGCONFIG_LIBS) spicec_LDADD = \ |