Commit 29268cc7 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

use full set, since current set wasn't building on all configs.

Wed Mar  7 20:08:48 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk-pixbuf/Makefile.am (GTKDOC_CFLAGS/LIBS): use full set,
	since current set wasn't building on all configs.

	* */Makefile.am: ...to build a more perfect Makefile.am...

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.)
parent 7ae2326a
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.
......
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.
......
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.
......
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.
......
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.
......
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.
......
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.
......
......@@ -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:
......
......@@ -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
......@@ -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
......@@ -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
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