sesame/tools Makefile.am,1.1.1.1,1.2 sesame-setup,1.1.1.1,1.2
David Zeuthen
david at freedesktop.org
Fri Dec 17 09:02:44 PST 2004
Update of /cvs/hal/sesame/tools
In directory gabe:/tmp/cvs-serv15177/tools
Modified Files:
Makefile.am sesame-setup
Log Message:
2004-12-17 David Zeuthen <davidz at redhat.com>
* tools/Makefile.am: Don't use @PACKAGE_LIBS@ as we are not using
any pkg-config'ed libraries yet
2004-12-17 David Zeuthen <davidz at redhat.com>
Start of project
Index: Makefile.am
===================================================================
RCS file: /cvs/hal/sesame/tools/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am 17 Dec 2004 16:56:52 -0000 1.1.1.1
+++ Makefile.am 17 Dec 2004 17:02:42 -0000 1.2
@@ -9,7 +9,8 @@
sesame_setup_SOURCES = sesame-setup.c
-sesame_setup_LDADD = @PACKAGE_LIBS@ $(top_builddir)/libsesame/libsesame.la
+# Add @PACKAGE_LIBS@ if using pkg-config packages; see configure.in
+sesame_setup_LDADD = $(top_builddir)/libsesame/libsesame.la
clean-local :
rm -f *~
Index: sesame-setup
===================================================================
RCS file: /cvs/hal/sesame/tools/sesame-setup,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sesame-setup 17 Dec 2004 16:56:52 -0000 1.1.1.1
+++ sesame-setup 17 Dec 2004 17:02:42 -0000 1.2
@@ -1,7 +1,7 @@
#! /bin/sh
# sesame-setup - temporary wrapper script for .libs/sesame-setup
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42)
+# Generated by ltmain.sh - GNU libtool 1.5.10 (1.1220.2.130 2004/09/19 12:13:49)
#
# The sesame-setup program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -16,9 +16,9 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-relink_command="(cd /home/davidz/Hacking/sesame/tools; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/usr/kerberos/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/home/davidz/bin\"; export PATH; gcc -g -O2 -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -o \$progdir/\$file sesame-setup.o -L/usr/kerberos/lib -lhal-storage -lhal -ldbus-1 -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz ../libsesame/.libs/libsesame.so -Wl,--rpath -Wl,/home/davidz/Hacking/sesame/libsesame/.libs -Wl,--rpath -Wl,/usr/local/lib)"
+relink_command="(cd /home/davidz/Hacking/sesame/tools; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/usr/kerberos/bin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/home/davidz/bin\"; export PATH; gcc -g -O2 -Wall -Wchar-subscripts -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -o \$progdir/\$file sesame-setup.o ../libsesame/.libs/libsesame.so -Wl,--rpath -Wl,/home/davidz/Hacking/sesame/libsesame/.libs -Wl,--rpath -Wl,/usr/local/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
More information about the hal-commit
mailing list