Commit 5cc30b2b authored by Stef Walter's avatar Stef Walter
Browse files

Rename the library subdirectory to libsecret

 * Death by a thousand paper cuts from gir and vapi not liking
   the fact that the secret.h file was not usable uninstalled
   and installed in the same way.
parent 931f677c
......@@ -66,14 +66,14 @@ stamp*
/egg/tests/test-*
!/egg/tests/test-*.c
/library/secret-dbus-generated.[ch]
/library/secret-enum-types.[ch]
/library/tests/test-*
/library/tests/*.metadata
!/library/tests/test-*.c
!/library/tests/test-*.js
!/library/tests/test-*.py
!/library/tests/test-*.vala
/library/tests/test-vala-lang.c
/libsecret/secret-dbus-generated.[ch]
/libsecret/secret-enum-types.[ch]
/libsecret/tests/test-*
/libsecret/tests/*.metadata
!/libsecret/tests/test-*.c
!/libsecret/tests/test-*.js
!/libsecret/tests/test-*.py
!/libsecret/tests/test-*.vala
/libsecret/tests/test-vala-lang.c
/tool/secret-tool
......@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
ACLOCAL_AMFLAGS = -I build/m4 ${ACLOCAL_FLAGS}
SUBDIRS = build egg library tool po docs .
SUBDIRS = build egg libsecret tool po docs .
DISTCHECK_CONFIGURE_FLAGS = \
--enable-debug=yes \
......
......@@ -8,7 +8,7 @@ ORIGDIR=`pwd`
cd $srcdir
PROJECT=libsecret
TEST_TYPE=-f
FILE=library/secret-value.c
FILE=libsecret/secret-value.c
DIE=0
......
......@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([build/m4])
AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
AM_SANITY_CHECK
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR([library/secret-value.c])
AC_CONFIG_SRCDIR([libsecret/secret-value.c])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable])
......@@ -247,9 +247,9 @@ AC_CONFIG_FILES([
egg/tests/Makefile
po/Makefile.in
po/Makefile
library/Makefile
library/libsecret.pc
library/tests/Makefile
libsecret/Makefile
libsecret/libsecret.pc
libsecret/tests/Makefile
tool/Makefile
])
AC_OUTPUT
......
......@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
DOC_SOURCE_DIR=$(top_srcdir)/library
DOC_SOURCE_DIR=$(top_srcdir)/libsecret
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
......@@ -48,8 +48,8 @@ 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)/library/*.h
CFILE_GLOB=$(top_srcdir)/library/*.c
HFILE_GLOB=$(top_srcdir)/libsecret/*.h
CFILE_GLOB=$(top_srcdir)/libsecret/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
......@@ -86,7 +86,7 @@ expand_content_files = \
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error
GTKDOC_LIBS= $(GLIB_LIBS) $(GOBJECT_LIBS) \
$(top_builddir)/library/libsecret-@SECRET_MAJOR@.la
$(top_builddir)/libsecret/libsecret-@SECRET_MAJOR@.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
......
<SECTION>
<FILE>secret-collection</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretCollection
SecretCollectionClass
SecretCollectionFlags
......@@ -48,7 +48,7 @@ secret_collection_create_flags_get_type
<SECTION>
<FILE>secret-item</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretItem
SecretItemClass
SecretItemFlags
......@@ -100,7 +100,7 @@ secret_item_create_flags_get_type
<SECTION>
<FILE>secret-error</FILE>
<INCLUDE>secret/secret.h</INCLUDE>
<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_ERROR
SecretError
<SUBSECTION Standard>
......@@ -111,7 +111,7 @@ secret_error_get_type
<SECTION>
<FILE>secret-password</FILE>
<INCLUDE>secret/secret.h</INCLUDE>
<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_COLLECTION_DEFAULT
SECRET_COLLECTION_SESSION
secret_password_store
......@@ -138,7 +138,7 @@ secret_password_free
<SECTION>
<FILE>secret-schema</FILE>
<INCLUDE>secret/secret.h</INCLUDE>
<INCLUDE>libsecret/secret.h</INCLUDE>
SECRET_SCHEMA_NOTE
SECRET_SCHEMA_COMPAT_NETWORK
SecretSchema
......@@ -160,7 +160,7 @@ SECRET_TYPE_SCHEMA_ATTRIBUTE_TYPE
<SECTION>
<FILE>secret-prompt</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretPrompt
SecretPromptClass
secret_prompt_perform
......@@ -180,7 +180,7 @@ secret_prompt_get_type
<SECTION>
<FILE>secret-service</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretService
SecretServiceClass
SecretServiceFlags
......@@ -242,7 +242,7 @@ secret_service_get_type
<SECTION>
<FILE>secret-paths</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
secret_collection_new_for_dbus_path
secret_collection_new_for_dbus_path_finish
secret_collection_new_for_dbus_path_sync
......@@ -290,7 +290,7 @@ secret_service_set_alias_to_dbus_path_sync
<SECTION>
<FILE>secret-value</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
SecretValue
secret_value_new
secret_value_new_full
......@@ -305,7 +305,7 @@ secret_value_get_type
<SECTION>
<FILE>secret-attributes</FILE>
<INCLUDE>secret/secret-unstable.h</INCLUDE>
<INCLUDE>libsecret/secret-unstable.h</INCLUDE>
secret_attributes_build
secret_attributes_buildv
</SECTION>
......
......@@ -18,7 +18,7 @@ INCLUDES = \
lib_LTLIBRARIES = libsecret-@SECRET_MAJOR@.la
incdir = $(includedir)/secret-@SECRET_MAJOR@/secret
incdir = $(includedir)/secret-@SECRET_MAJOR@/libsecret
HEADER_FILES = \
secret.h \
......@@ -119,7 +119,7 @@ Secret_@SECRET_MAJOR@_gir_INCLUDES = GObject-2.0 Gio-2.0
Secret_@SECRET_MAJOR@_gir_LIBS = libsecret-@SECRET_MAJOR@.la
Secret_@SECRET_MAJOR@_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DSECRET_COMPILATION -DSECRET_API_SUBJECT_TO_CHANGE
Secret_@SECRET_MAJOR@_gir_FILES = $(PUBLIC_FILES)
Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "secret.h"
Secret_@SECRET_MAJOR@_gir_SCANNERFLAGS = --c-include "libsecret/secret.h"
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
......
......@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_ATTRIBUTES_H__
......
......@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_COLLECTION_H__
......
......@@ -13,7 +13,7 @@
*/
#if !defined (__SECRET_INSIDE_HEADER__) && !defined (SECRET_COMPILATION)
#error "Only <secret/secret.h> or <secret/secret-unstable.h> can be included directly."
#error "Only <libsecret/secret.h> or <libsecret/secret-unstable.h> can be included directly."
#endif
#ifndef __SECRET_ITEM_H__
......
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