Commit aaa44524 authored by Stefan Walter's avatar Stefan Walter

Reorganized file tree. All library and common files All daemon files

	* Reorganized file tree. 
	* library/*: All library and common files
	* daemon/*: All daemon files
	* doc/*: Random documentation
	* configure.in: Updated version number development version


svn path=/trunk/; revision=569
parent c8904a85
2007-03-31 Nate Nielsen <nielsen@memberwebs.com>
* Reorganized file tree.
* library/*: All library and common files
* daemon/*: All daemon files
* doc/*: Random documentation
* configure.in: Updated version number development version
=== Branched for 2.18 work on gnome-2-18 branch ==
2007-03-31 Nate Nielsen <nielsen@memberwebs.com>
* gnome-keyring-daemon.c: Fix null pointer crashes.
......
Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
......
SUBDIRS = \
. \
library \
daemon \
doc \
po \
reference
libgnomekeyringincludedir = $(includedir)/gnome-keyring-1/
bin_PROGRAMS= \
gnome-keyring-daemon
libexec_PROGRAMS= \
gnome-keyring-ask
noinst_PROGRAMS= \
list-keyrings \
test-keyring \
test-keyring-two
lib_LTLIBRARIES=libgnome-keyring.la
noinst_LTLIBRARIES=libgnome-keyring-common.la
INCLUDES= \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS)
libgnome_keyring_common_la_SOURCES = \
gnome-keyring-private.h \
gnome-keyring-proto.c \
gnome-keyring-proto.h \
gnome-keyring-utils.c
libgnome_keyring_common_la_LIBADD = \
$(GLIB_LIBS)
libgnome_keyring_la_SOURCES = \
gnome-keyring.c \
gnome-keyring.h
libgnomekeyringinclude_HEADERS = \
gnome-keyring.h
libgnome_keyring_la_LIBADD = \
libgnome-keyring-common.la \
$(GLIB_LIBS)
libgnome_keyring_la_LDFLAGS = \
-version-info $(LIB_GNOME_KEYRING_LT_VERSION) \
-no-undefined
LIBADD_SOURCE = mkdtemp.c mkdtemp.h
gnome_keyring_daemon_SOURCES = \
aes.c \
aes.h \
aes_be.h \
aes_le.h \
beecrypt_compat.h \
md5.c \
md5.h \
sha256.c \
sha256.h \
gnome-keyring-daemon.c \
gnome-keyring-daemon-file.c \
gnome-keyring-daemon.h \
gnome-keyring-daemon-io.c \
gnome-keyring-daemon-dbus.c
gnome_keyring_daemon_LDADD = \
libgnome-keyring-common.la \
@LIBOBJS@ \
$(GLIB_LIBS)
gnome_keyring_ask_SOURCES = \
gnome-keyring-ask.c
gnome_keyring_ask_LDADD = \
$(GTK_LIBS)
list_keyrings_SOURCES = \
list-keyrings.c
list_keyrings_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
test_keyring_SOURCES = \
test.c
test_keyring_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
test_keyring_two_SOURCES = \
test.c
test_keyring_two_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-keyring-1.pc
EXTRA_DIST = \
$(LIBADD_SOURCE) \
file-format.txt \
keyring-intro.txt \
gnome-keyring-1-uninstalled.pc.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
......
......@@ -8,8 +8,8 @@ PKG_NAME="gnome-keyring"
REQUIRED_AUTOMAKE_VERSION=1.6
(test -f $srcdir/configure.in \
&& test -f $srcdir/gnome-keyring.h \
&& test -f $srcdir/gnome-keyring.c) || {
&& test -f $srcdir/library/gnome-keyring.h \
&& test -f $srcdir/library/gnome-keyring.c) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
......
AC_INIT(gnome-keyring.h)
AC_INIT(library/gnome-keyring.h)
AM_INIT_AUTOMAKE(gnome-keyring, 0.8)
AM_INIT_AUTOMAKE(gnome-keyring, 0.9.1)
AM_CONFIG_HEADER(config.h)
AM_SANITY_CHECK
......@@ -191,8 +191,11 @@ fi
AC_OUTPUT([
Makefile
daemon/Makefile
doc/Makefile
library/Makefile
po/Makefile.in
reference/Makefile
gnome-keyring-1.pc
gnome-keyring-1-uninstalled.pc
library/gnome-keyring-1.pc
library/gnome-keyring-1-uninstalled.pc
])
bin_PROGRAMS= \
gnome-keyring-daemon
libexec_PROGRAMS= \
gnome-keyring-ask
INCLUDES= \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/library/ \
-I$(top_builddir) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS)
LIBADD_SOURCE = mkdtemp.c mkdtemp.h
gnome_keyring_daemon_SOURCES = \
aes.c \
aes.h \
aes_be.h \
aes_le.h \
beecrypt_compat.h \
md5.c \
md5.h \
sha256.c \
sha256.h \
gnome-keyring-daemon.c \
gnome-keyring-daemon-file.c \
gnome-keyring-daemon.h \
gnome-keyring-daemon-io.c \
gnome-keyring-daemon-dbus.c
gnome_keyring_daemon_LDADD = \
$(top_builddir)/library/libgnome-keyring-common.la \
@LIBOBJS@ \
$(GLIB_LIBS)
gnome_keyring_ask_SOURCES = \
gnome-keyring-ask.c
gnome_keyring_ask_LDADD = \
$(GTK_LIBS)
EXTRA_DIST = \
$(LIBADD_SOURCE)
EXTRA_DIST = \
file-format.txt \
keyring-intro.txt
libgnomekeyringincludedir = $(includedir)/gnome-keyring-1/
noinst_PROGRAMS= \
list-keyrings \
test-keyring \
test-keyring-two
lib_LTLIBRARIES=libgnome-keyring.la
noinst_LTLIBRARIES=libgnome-keyring-common.la
INCLUDES= \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS)
libgnome_keyring_common_la_SOURCES = \
gnome-keyring-private.h \
gnome-keyring-proto.c \
gnome-keyring-proto.h \
gnome-keyring-utils.c
libgnome_keyring_common_la_LIBADD = \
$(GLIB_LIBS)
libgnome_keyring_la_SOURCES = \
gnome-keyring.c \
gnome-keyring.h
libgnomekeyringinclude_HEADERS = \
gnome-keyring.h
libgnome_keyring_la_LIBADD = \
libgnome-keyring-common.la \
$(GLIB_LIBS)
libgnome_keyring_la_LDFLAGS = \
-version-info $(LIB_GNOME_KEYRING_LT_VERSION) \
-no-undefined
list_keyrings_SOURCES = \
list-keyrings.c
list_keyrings_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
test_keyring_SOURCES = \
test.c
test_keyring_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
test_keyring_two_SOURCES = \
test.c
test_keyring_two_LDADD = \
libgnome-keyring.la \
$(GTK_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-keyring-1.pc
EXTRA_DIST = \
gnome-keyring-1-uninstalled.pc.in
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
gnome-keyring-ask.c
daemon/gnome-keyring-ask.c
......@@ -44,23 +44,14 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=$(top_srcdir)/*.h
CFILE_GLOB=$(top_srcdir)/*.c
HFILE_GLOB=$(top_srcdir)/library/*.h
CFILE_GLOB=$(top_srcdir)/library/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
IGNORE_HFILES=\
aes_be.h \
aes.h \
aes_le.h \
beecrypt_compat.h \
config.h \
gnome-keyring-daemon.h \
gnome-keyring-private.h \
gnome-keyring-proto.h \
md5.h \
mkdtemp.h \
sha256.h \
$(NULL)
# Images to copy into HTML directory.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment