[Fedora-directory-commits] coolkey/src/libckyapplet Makefile.in, 1.1, 1.2 dynlink.c, 1.1, 1.2

[Doctor Conrad]

Author: rrelyea

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

Modified Files:
    Makefile.in dynlink.c 
Log Message:

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

Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in	9 Jun 2006 18:44:17 -0000	1.1
+++ Makefile.in	9 Jun 2006 21:56:35 -0000	1.2
@@ -42,7 +42,7 @@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -59,7 +59,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = clib
+subdir = src/libckyapplet
 DIST_COMMON = $(nobase_include_HEADERS) $(noinst_HEADERS) \
    $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -258,9 +258,9 @@
          exit 1;; \
      esac; \
    done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  clib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/libckyapplet/Makefile'; \
    cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  clib/Makefile
+	  $(AUTOMAKE) --gnu  src/libckyapplet/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    @case '$?' in \

Index: dynlink.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/dynlink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dynlink.c	9 Jun 2006 18:44:17 -0000	1.1
+++ dynlink.c	9 Jun 2006 21:56:35 -0000	1.2
@@ -17,7 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * ***** END COPYRIGHT BLOCK ***** */

-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif

#ifdef WIN32
 #include "dynlink_win.c"