diff options
| author | Stef Walter <stefw@gnome.org> | 2012-12-22 21:26:10 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-12-22 23:31:36 +0100 |
| commit | 41d96e69e8b56aa88e36e8bd176c51c5aa93caf9 (patch) | |
| tree | f78639aeef07a56cf9913e9d921f141957ecf351 /docs | |
| parent | 86550b678407e360515878703e81258044d84541 (diff) | |
| download | gcr-41d96e69e8b56aa88e36e8bd176c51c5aa93caf9.tar.gz | |
Separate the base and ui parts of the Gcr library more thoroughly.
* This is due to gobject introspection not being able to have separate
GIRs provide the same namespace, and the desire to conditionally
build the GTK+ dependent stuff.
* Partially based on a patch by Mathias Hasselmann
* Separate GIRs: Gcr and GcrUi
* Separate libraries: libgcr-base-3.so and libgcr-ui-3.so. The latter
links to the former.
* Symlink libgcr-3.so to libgcr-ui-3.so
* Expose internal symbols in libgcr-base-3.so so they can be easily
shared by libgcr-ui-3.so
* Add --without-gtk argument
https://bugzilla.gnome.org/show_bug.cgi?id=688678
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/gcr/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am index 2b21161..72eeaed 100644 --- a/docs/reference/gcr/Makefile.am +++ b/docs/reference/gcr/Makefile.am @@ -48,12 +48,12 @@ 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)/$(DOC_MODULE)/*.h -CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.c +HFILE_GLOB=$(top_srcdir)/gcr/*.h $(top_srcdir)/ui/*.h +CFILE_GLOB=$(top_srcdir)/gcr/*.c $(top_srcdir)/ui/*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= +EXTRA_HFILES=$(top_srcdir)/ui/*.h # Header files to ignore when scanning. Use base file name, no paths # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h @@ -119,8 +119,8 @@ expand_content_files= GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) -Wno-error \ -Wno-deprecated-declarations GTKDOC_LIBS= $(GLIB_LIBS) \ - $(top_builddir)/$(DOC_MODULE)/libgcr-ui-@GCR_MAJOR@.la \ - $(top_builddir)/$(DOC_MODULE)/libgcr-base-@GCR_MAJOR@.la \ + $(top_builddir)/ui/libgcr-ui-@GCR_MAJOR@.la \ + $(top_builddir)/gcr/libgcr-base-@GCR_MAJOR@.la \ $(top_builddir)/gck/libgck-@GCK_MAJOR@.la # This includes the standard gtk-doc make rules, copied by gtkdocize. @@ -167,7 +167,7 @@ gcr-shooter: $(SHOOTER_SRCS) $(SHOOTER_HEADERS) Makefile -I$(top_srcdir)/gcr -DGCR_API_SUBJECT_TO_CHANGE \ -DSRCDIR=\"$(srcdir)\" -DTOPDIR=\"$(top_srcdir)\" \ `pkg-config x11 xext --cflags --libs` \ - $(GTK_LDFLAGS) -lm $(top_builddir)/gcr/libgcr-testable.la \ + $(GTK_LDFLAGS) -lm $(top_builddir)/ui/libgcr-ui-@GCR_MAJOR@.la \ $(SHOOTER_SRCS) EXTRA_DIST += $(SHOOTER_SRCS) \ |