[Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.1, 1.2 Makefile.in, 1.1, 1.2

[Doctor Conrad]

Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10446/src/coolkey

Modified Files:
    Makefile.am Makefile.in 
Log Message:

Build in new tree location.
update .spec file from review comments.

Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	9 Jun 2006 18:39:11 -0000	1.1
+++ Makefile.am	9 Jun 2006 21:56:34 -0000	1.2
@@ -49,7 +49,7 @@
    $(NULL)

libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym
-libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/clib $(PCSC_CFLAGS)
+libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS)
 libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
 libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@

Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in	9 Jun 2006 18:39:11 -0000	1.1
+++ Makefile.in	9 Jun 2006 21:56:34 -0000	1.2
@@ -58,7 +58,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = pkcs11/smartcard
+subdir = src/coolkey
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -254,7 +254,7 @@
    $(NULL)

libcoolkeypk11_la_LDFLAGS = -module -avoid-version -export-symbols coolkeypk11.sym
-libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/clib $(PCSC_CFLAGS)
+libcoolkeypk11_la_CPPFLAGS = $(CPPFLAGS) -DNSS_HIDE_NONSTANDARD_OBJECTS=1 -I$(top_srcdir)/src/libckyapplet $(PCSC_CFLAGS)
 libcoolkeypk11_la_DEPENDENCIES = coolkeypk11.sym
 libcoolkeypk11_la_LIBADD = @LIBCKYAPPLET@ 
 all: all-recursive
@@ -270,9 +270,9 @@
          exit 1;; \
      esac; \
    done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pkcs11/smartcard/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/coolkey/Makefile'; \
    cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pkcs11/smartcard/Makefile
+	  $(AUTOMAKE) --gnu  src/coolkey/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    @case '$?' in \