summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--Makefile.am4
-rw-r--r--docs/reference/gdk-pixbuf/Makefile.am55
-rw-r--r--docs/reference/gdk/Makefile.am41
-rw-r--r--docs/reference/gtk/Makefile.am41
11 files changed, 116 insertions, 60 deletions
diff --git a/ChangeLog b/ChangeLog
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d0c527a6ec..12ee0ce7f1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Mar 7 20:07:22 2001 Owen Taylor <otaylor@redhat.com>
+
+ * Makefile.am: Remove gtk-config-2.0 again.
+ (Grrrr, pkg-config. And stops make loops.)
+
Thu Mar 8 00:18:29 2001 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: removed old emission hook API.
diff --git a/Makefile.am b/Makefile.am
index 6ba3ec04a3..1ee167e411 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,10 +149,6 @@ dist-hook: gtk+.spec
m4datadir = $(datadir)/aclocal
m4data_DATA = gtk-2.0.m4
-bin_SCRIPTS=gtk-config-2.0
-BUILT_SOURCES=gtk-config-2.0
-gtk-config-2.0: gtk-config-2.0.in
-
.PHONY: files release sanity snapshot
files:
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 2df312609d..42892795f8 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -50,15 +50,26 @@ extra_files =
GTKDOC_CFLAGS = @STRIP_BEGIN@ \
@CFLAGS@ \
-I$(top_srcdir) \
+ -I$(top_builddir)/gdk \
+ -DGTK_DISABLE_COMPAT_H \
+ @GTK_DEBUG_FLAGS@ \
+ @GTK_XIM_FLAGS@ \
+ @GTK_LOCALE_FLAGS@ \
+ @PANGO_CFLAGS@ \
@GLIB_CFLAGS@ \
@more_cflags@ \
@STRIP_END@
GTKDOC_LIBS = @STRIP_BEGIN@ \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
+ $(top_builddir)/gdk/@gdktargetlib@ \
+ $(top_builddir)/gtk/@gtktargetlib@ \
@more_ldflags@ \
@more_libs@ \
+ @GDK_WLIBS@ \
+ @PANGO_LIBS@ \
@GLIB_LIBS@ \
+ @GTK_LIBS_EXTRA@ \
-lm \
@STRIP_END@
@@ -81,21 +92,24 @@ EXTRA_DIST = \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
- $(DOC_MODULE).signal
+ $(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
cd $(srcdir) && ( \
if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null ; then \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --nogtkinit; \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
else \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
@@ -105,33 +119,33 @@ scan-build.stamp: $(HFILE_GLOB)
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
-check_scan:
- $(MAKE) scan-build.stamp
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+ @true
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): check_scan
+#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
-check_templates:
- $(MAKE) tmpl-build.stamp
+tmpl.stamp: tmpl-build.stamp
+ @true
-tmpl.stamp: check_templates
+#### sgml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB)
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
-check_sgml:
- $(MAKE) sgml-build.stamp
+sgml.stamp: sgml-build.stamp
+ @true
-sgml.stamp: check_sgml
+#### html ####
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
test -d $(srcdir)/html || mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -141,8 +155,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
touch html-build.stamp
endif
+##############
+
clean-local:
- rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) $(srcdir)/sgml.stamp
+ rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@@ -185,5 +201,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
cp $(srcdir)/$$i $(distdir)/html ; \
done
-.PHONY : check_sgml check_templates check_scan dist-hook-local
-
+.PHONY : dist-hook-local
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 60c8e1e5d8..cece6ebd74 100644
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -72,15 +72,18 @@ EXTRA_DIST = \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
- $(DOC_MODULE).signal
+ $(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
@@ -96,33 +99,33 @@ scan-build.stamp: $(HFILE_GLOB)
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
-check_scan:
- $(MAKE) scan-build.stamp
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+ @true
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): check_scan
+#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
-check_templates:
- $(MAKE) tmpl-build.stamp
+tmpl.stamp: tmpl-build.stamp
+ @true
-tmpl.stamp: check_templates
+#### sgml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB)
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
-check_sgml:
- $(MAKE) sgml-build.stamp
+sgml.stamp: sgml-build.stamp
+ @true
-sgml.stamp: check_sgml
+#### html ####
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
test -d $(srcdir)/html || mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -132,8 +135,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
touch html-build.stamp
endif
+##############
+
clean-local:
- rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) $(srcdir)/sgml.stamp
+ rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@@ -176,4 +181,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
cp $(srcdir)/$$i $(distdir)/html ; \
done
-.PHONY : check_sgml check_templates check_scan dist-hook-local
+.PHONY : dist-hook-local
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 1a32ae5495..8605f3539f 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -108,15 +108,18 @@ EXTRA_DIST = \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
- $(DOC_MODULE).signal
+ $(DOC_MODULE).signals
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+
+#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
@@ -132,33 +135,33 @@ scan-build.stamp: $(HFILE_GLOB)
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
-check_scan:
- $(MAKE) scan-build.stamp
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+ @true
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): check_scan
+#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
-check_templates:
- $(MAKE) tmpl-build.stamp
+tmpl.stamp: tmpl-build.stamp
+ @true
-tmpl.stamp: check_templates
+#### sgml ####
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB)
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) tmpl/*.sgml
@echo '*** Building SGML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch sgml-build.stamp
-check_sgml:
- $(MAKE) sgml-build.stamp
+sgml.stamp: sgml-build.stamp
+ @true
-sgml.stamp: check_sgml
+#### html ####
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
test -d $(srcdir)/html || mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -168,8 +171,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE)
touch html-build.stamp
endif
+##############
+
clean-local:
- rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) $(srcdir)/sgml.stamp
+ rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
@@ -212,4 +217,4 @@ dist-hook: dist-check-gtkdoc dist-hook-local
cp $(srcdir)/$$i $(distdir)/html ; \
done
-.PHONY : check_sgml check_templates check_scan dist-hook-local
+.PHONY : dist-hook-local
View Lorry Controller Status