diff options
author | Carlos Garnacho <carlos@imendio.com> | 2008-10-07 12:04:40 +0000 |
---|---|---|
committer | Carlos Garnacho <carlosg@src.gnome.org> | 2008-10-07 12:04:40 +0000 |
commit | 3518bc5197b89c4ea778efae6be4ee90aa6d07dd (patch) | |
tree | 9e9da52e1bf72894b5e0d899cf68941b71918a9f | |
parent | 544e2c31c68f977ef21cd9fa9723e2e339bb7a9e (diff) | |
download | tracker-3518bc5197b89c4ea778efae6be4ee90aa6d07dd.tar.gz |
New file. Do not allow compiling unless TRACKER_ENABLE_INTERNALS or
2008-10-07 Carlos Garnacho <carlos@imendio.com>
* src/libtracker-common/tracker-common.h: New file. Do not allow
compiling unless TRACKER_ENABLE_INTERNALS or TRACKER_COMPILATION is
defined.
* src/libtracker-common/*.h: Do not allow including anything but
libtracker-common/tracker-common.h outside of tracker.
* */Makefile.am: define TRACKER_COMPILATION.
svn path=/trunk/; revision=2317
30 files changed, 143 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2008-10-07 Carlos Garnacho <carlos@imendio.com> + + * src/libtracker-common/tracker-common.h: New file. Do not allow + compiling unless TRACKER_ENABLE_INTERNALS or TRACKER_COMPILATION is + defined. + * src/libtracker-common/*.h: Do not allow including anything but + libtracker-common/tracker-common.h outside of tracker. + * */Makefile.am: define TRACKER_COMPILATION. + 2008-10-06 Carlos Garnacho <carlos@imendio.com> * src/tracker-indexer/modules/evolution.c (extract_message_text): How diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am index 79cb98787..35ada5e20 100644 --- a/src/libtracker-common/Makefile.am +++ b/src/libtracker-common/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl INCLUDES = \ -DSHAREDIR=\""$(datadir)"\" \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(HAL_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h new file mode 100644 index 000000000..7b00559ac --- /dev/null +++ b/src/libtracker-common/tracker-common.h @@ -0,0 +1,49 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org) + * Copyright (C) 2008, Nokia (urho.konttori@nokia.com) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __LIBTRACKER_COMMON_H__ +#define __LIBTRACKER_COMMON_H__ + +G_BEGIN_DECLS + +#if !defined (TRACKER_ENABLE_INTERNALS) && !defined (TRACKER_COMPILATION) +#error "TRACKER_ENABLE_INTERNALS not defined, this must be defined to use tracker's internal functions" +#endif + +#define __LIBTRACKER_COMMON_INSIDE__ + +#include "tracker-config.h" +#include "tracker-field.h" +#include "tracker-file-utils.h" +#include "tracker-language.h" +#include "tracker-module-config.h" +#include "tracker-ontology.h" +#include "tracker-parser.h" +#include "tracker-service.h" +#include "tracker-type-utils.h" +#include "tracker-utils.h" + +#undef __LIBTRACKER_COMMON_INSIDE__ + + +G_END_DECLS + +#endif /* __LIBTRACKER_COMMON_H__ */ diff --git a/src/libtracker-common/tracker-config.h b/src/libtracker-common/tracker-config.h index 7228b549a..dd878b1ab 100644 --- a/src/libtracker-common/tracker-config.h +++ b/src/libtracker-common/tracker-config.h @@ -27,6 +27,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_CONFIG (tracker_config_get_type ()) #define TRACKER_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG, TrackerConfig)) #define TRACKER_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG, TrackerConfigClass)) diff --git a/src/libtracker-common/tracker-configuration.h b/src/libtracker-common/tracker-configuration.h index 99d44aed6..3947759aa 100644 --- a/src/libtracker-common/tracker-configuration.h +++ b/src/libtracker-common/tracker-configuration.h @@ -25,6 +25,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + typedef struct _LanguageMapEntry { const gchar * const code; const gchar * const language; diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h index 94aa5f3ee..9e53322c9 100644 --- a/src/libtracker-common/tracker-dbus.h +++ b/src/libtracker-common/tracker-dbus.h @@ -22,6 +22,10 @@ #ifndef __LIBTRACKER_DBUS_H__ #define __LIBTRACKER_DBUS_H__ +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #ifndef DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE #endif diff --git a/src/libtracker-common/tracker-field-data.h b/src/libtracker-common/tracker-field-data.h index 06f66b73c..f5bbaf9eb 100644 --- a/src/libtracker-common/tracker-field-data.h +++ b/src/libtracker-common/tracker-field-data.h @@ -28,6 +28,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_FIELD_DATA (tracker_field_data_get_type ()) #define TRACKER_FIELD_DATA(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldData)) #define TRACKER_FIELD_DATA_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass)) diff --git a/src/libtracker-common/tracker-field.h b/src/libtracker-common/tracker-field.h index 85b288909..9815359c3 100644 --- a/src/libtracker-common/tracker-field.h +++ b/src/libtracker-common/tracker-field.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_FIELD_TYPE (tracker_field_type_get_type ()) typedef enum { diff --git a/src/libtracker-common/tracker-file-utils.h b/src/libtracker-common/tracker-file-utils.h index 283d859e0..db8aa47a3 100644 --- a/src/libtracker-common/tracker-file-utils.h +++ b/src/libtracker-common/tracker-file-utils.h @@ -22,6 +22,10 @@ #ifndef __LIBTRACKER_COMMON_FILE_UTILS_H__ #define __LIBTRACKER_COMMON_FILE_UTILS_H__ +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #include <glib.h> gint tracker_file_open (const gchar *uri, diff --git a/src/libtracker-common/tracker-hal.h b/src/libtracker-common/tracker-hal.h index 80e0a0395..6459fed6c 100644 --- a/src/libtracker-common/tracker-hal.h +++ b/src/libtracker-common/tracker-hal.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_HAL (tracker_hal_get_type ()) #define TRACKER_HAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_HAL, TrackerHal)) #define TRACKER_HAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_HAL, TrackerHalClass)) diff --git a/src/libtracker-common/tracker-ioprio.h b/src/libtracker-common/tracker-ioprio.h index 386386a60..7ad76007c 100644 --- a/src/libtracker-common/tracker-ioprio.h +++ b/src/libtracker-common/tracker-ioprio.h @@ -23,6 +23,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + void tracker_ioprio_init (void); G_END_DECLS diff --git a/src/libtracker-common/tracker-language.h b/src/libtracker-common/tracker-language.h index a610eb947..872b7bd64 100644 --- a/src/libtracker-common/tracker-language.h +++ b/src/libtracker-common/tracker-language.h @@ -28,6 +28,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_LANGUAGE (tracker_language_get_type ()) #define TRACKER_LANGUAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguage)) #define TRACKER_LANGUAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass)) diff --git a/src/libtracker-common/tracker-log.h b/src/libtracker-common/tracker-log.h index 55ec3f7a9..af2855d1f 100644 --- a/src/libtracker-common/tracker-log.h +++ b/src/libtracker-common/tracker-log.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + gboolean tracker_log_init (const char *filename, gint verbosity); void tracker_log_shutdown (void); diff --git a/src/libtracker-common/tracker-module-config.h b/src/libtracker-common/tracker-module-config.h index 0771180e2..5052d8507 100644 --- a/src/libtracker-common/tracker-module-config.h +++ b/src/libtracker-common/tracker-module-config.h @@ -25,6 +25,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + gboolean tracker_module_config_init (void); void tracker_module_config_shutdown (void); diff --git a/src/libtracker-common/tracker-nfs-lock.h b/src/libtracker-common/tracker-nfs-lock.h index 0306914e1..abfa7323c 100644 --- a/src/libtracker-common/tracker-nfs-lock.h +++ b/src/libtracker-common/tracker-nfs-lock.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + void tracker_nfs_lock_init (gboolean nfs); void tracker_nfs_lock_shutdown (void); gboolean tracker_nfs_lock_obtain (void); diff --git a/src/libtracker-common/tracker-ontology.h b/src/libtracker-common/tracker-ontology.h index 2dfa0f978..f682a96f2 100644 --- a/src/libtracker-common/tracker-ontology.h +++ b/src/libtracker-common/tracker-ontology.h @@ -29,6 +29,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + void tracker_ontology_init (void); void tracker_ontology_shutdown (void); diff --git a/src/libtracker-common/tracker-os-dependant.h b/src/libtracker-common/tracker-os-dependant.h index c5025f67b..ceb6ea5fc 100644 --- a/src/libtracker-common/tracker-os-dependant.h +++ b/src/libtracker-common/tracker-os-dependant.h @@ -22,6 +22,10 @@ #ifndef __LIBTRACKER_COMMON_OS_DEPENDANT_H__ #define __LIBTRACKER_COMMON_OS_DEPENDANT_H__ +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #include <glib.h> #include <glib/gstdio.h> diff --git a/src/libtracker-common/tracker-parser.h b/src/libtracker-common/tracker-parser.h index 612731301..c890c3e91 100644 --- a/src/libtracker-common/tracker-parser.h +++ b/src/libtracker-common/tracker-parser.h @@ -29,6 +29,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + typedef enum { TRACKER_PARSER_ENCODING_ASCII, TRACKER_PARSER_ENCODING_LATIN, diff --git a/src/libtracker-common/tracker-service.h b/src/libtracker-common/tracker-service.h index ad38daf1a..a4a032840 100644 --- a/src/libtracker-common/tracker-service.h +++ b/src/libtracker-common/tracker-service.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + #define TRACKER_TYPE_DB_TYPE (tracker_db_type_get_type ()) typedef enum { diff --git a/src/libtracker-common/tracker-type-utils.h b/src/libtracker-common/tracker-type-utils.h index cbc652108..3b83a930f 100644 --- a/src/libtracker-common/tracker-type-utils.h +++ b/src/libtracker-common/tracker-type-utils.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif + gchar * tracker_date_format (const gchar *time_string); gchar * tracker_date_to_time_string (const gchar *date_string); time_t tracker_string_to_date (const gchar *time_string); diff --git a/src/libtracker-common/tracker-utils.h b/src/libtracker-common/tracker-utils.h index f943a830c..b6f6aece7 100644 --- a/src/libtracker-common/tracker-utils.h +++ b/src/libtracker-common/tracker-utils.h @@ -22,8 +22,11 @@ #ifndef __LIBTRACKER_COMMON_UTILS_H__ #define __LIBTRACKER_COMMON_UTILS_H__ -#include <glib.h> +#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION) +#error "only <libtracker-common/tracker-common.h> must be included directly." +#endif +#include <glib.h> #include "tracker-config.h" gboolean tracker_is_empty_string (const char *str); diff --git a/src/libtracker-db/Makefile.am b/src/libtracker-db/Makefile.am index e4dc1542f..22f1ceb30 100644 --- a/src/libtracker-db/Makefile.am +++ b/src/libtracker-db/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl INCLUDES = \ -DSHAREDIR=\""$(datadir)"\" \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(SQLITE3_CFLAGS) \ $(QDBM_CFLAGS) \ diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am index e6e66083b..d7a06212e 100644 --- a/src/tracker-extract/Makefile.am +++ b/src/tracker-extract/Makefile.am @@ -18,7 +18,8 @@ INCLUDES = \ $(XINE_CFLAGS) \ $(GDKPIXBUF_CFLAGS) \ -I$(top_srcdir)/src \ - -DMODULES_DIR=\"$(modulesdir)\" + -DMODULES_DIR=\"$(modulesdir)\" \ + -DTRACKER_COMPILATION modules_LTLIBRARIES = \ libextract-abw.la \ diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am index 012f5ce61..86496f128 100644 --- a/src/tracker-indexer/Makefile.am +++ b/src/tracker-indexer/Makefile.am @@ -9,10 +9,11 @@ INCLUDES = \ -DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\" \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(DBUS_CFLAGS) \ $(PANGO_CFLAGS) \ - $(GMODULE_CFLAGS) + $(GMODULE_CFLAGS) libexec_PROGRAMS = tracker-indexer diff --git a/src/tracker-indexer/modules/Makefile.am b/src/tracker-indexer/modules/Makefile.am index c8c004ad8..c6278dfca 100644 --- a/src/tracker-indexer/modules/Makefile.am +++ b/src/tracker-indexer/modules/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -DINDEXER_MODULES_DIR=\"$(indexer_modulesdir)\" \ -DG_LOG_DOMAIN=\"Tracker\" \ -D_GNU_SOURCE \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(GMODULE_CFLAGS) \ $(GIO_CFLAGS) \ diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am index a7605d865..671cd6c11 100644 --- a/src/tracker-preferences/Makefile.am +++ b/src/tracker-preferences/Makefile.am @@ -15,6 +15,7 @@ INCLUDES = \ -DTRACKER_DATADIR=\""$(datadir)/tracker"\" \ -DTRACKER_LOCALEDIR=\""$(localedir)"\" \ -DTRACKER_BINDIR=\""$(bindir)"\" \ + -DTRACKER_COMPILATION \ $(GLIB_CFLAGS) \ $(GTK2_CFLAGS) \ $(LIBGLADE_CFLAGS) \ diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am index f57aedcef..c2945b6c1 100644 --- a/src/trackerd/Makefile.am +++ b/src/trackerd/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -DMAIL_MODULES_DIR=\""$(libdir)"/tracker/mail-modules\" \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(GMIME_CFLAGS) \ $(FAM_CFLAGS) \ diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am index 6c1367a97..ab2b376d7 100644 --- a/tests/libtracker-common/Makefile.am +++ b/tests/libtracker-common/Makefile.am @@ -22,6 +22,7 @@ TEST_PROGS += \ INCLUDES = \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tests/common \ $(DBUS_CFLAGS) \ diff --git a/tests/libtracker-db/Makefile.am b/tests/libtracker-db/Makefile.am index 06b208ca6..b9e59eb32 100644 --- a/tests/libtracker-db/Makefile.am +++ b/tests/libtracker-db/Makefile.am @@ -22,6 +22,7 @@ TEST_PROGS += \ INCLUDES = \ -DG_LOG_DOMAIN=\"Tracker\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tests/common \ $(DBUS_CFLAGS) \ diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am index 225fe162b..d8a332a9a 100644 --- a/tests/tracker-indexer/Makefile.am +++ b/tests/tracker-indexer/Makefile.am @@ -11,13 +11,14 @@ INCLUDES = \ -DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ + -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tests/common \ $(DBUS_CFLAGS) \ $(PANGO_CFLAGS) \ $(GMODULE_CFLAGS) \ $(GTHREAD_CFLAGS) \ - $(GLIB2_CFLAGS) + $(GLIB2_CFLAGS) tracker_metadata_utils_SOURCES = \ tracker-dbus.c \ |