[Pcsclite-cvs-commit] r6736 - trunk/Drivers/ccid/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-08-23 08:36:37 +0000 (Fri, 23 Aug 2013)
New Revision: 6736

Modified:
   trunk/Drivers/ccid/src/Makefile.am
Log:
Uninstall libccidtwin in the uninstall rule

If libccidtwin is installed in install rule we should also remove it
in the uninstall rule


Modified: trunk/Drivers/ccid/src/Makefile.am
===================================================================
--- trunk/Drivers/ccid/src/Makefile.am	2013-08-23 08:31:02 UTC (rev 6735)
+++ trunk/Drivers/ccid/src/Makefile.am	2013-08-23 08:36:37 UTC (rev 6736)
@@ -8,14 +8,17 @@
 
 lib_LTLIBRARIES =
 LIBS_TO_INSTALL =
+LIBS_TO_UNINSTALL =
 if WITH_LIBUSB
 lib_LTLIBRARIES += libccid.la
 LIBS_TO_INSTALL += install_ccid
+LIBS_TO_UNINSTALL += uninstall_ccid
 noinst_PROGRAMS = parse
 endif
 if WITH_TWIN_SERIAL
 lib_LTLIBRARIES += libccidtwin.la
 LIBS_TO_INSTALL += install_ccidtwin
+LIBS_TO_UNINSTALL += uninstall_ccidtwin
 endif
 
 COMMON = ccid.c \
@@ -96,11 +99,12 @@
 
 # do not uninstall the serial driver by default
 # use explicitely 'make uninstall_ccidtwin'
-uninstall-local: uninstall_ccid
+uninstall-local: $(LIBS_TO_UNINSTALL)
 
 uninstall_ccid:
 	rm -rf $(DESTDIR)$(usbdropdir)/$(CCID_BUNDLE)
 
 uninstall_ccidtwin:
-	rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB).$(VERSION)
+	rm -f $(DESTDIR)$(ccidtwindir)/$(CCIDTWIN_LIB)
+	rm -f $(DESTDIR)/$(serialconfdir)/libccidtwin