luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks from GTK+. Reenable $(HTML_IMAGES) with shell portability

Browse Source 
Mon Apr 16 12:18:26 2001  Owen Taylor  <otaylor@redhat.com>

        * {glib,gobject}/Makefile.am (tmpl-build.stamp): More tweaks
        from GTK+. Reenable $(HTML_IMAGES) with shell portability fixes.
This commit is contained in:
Owen Taylor 2001-04-16 16:34:15 +00:00 committed by Owen Taylor
parent 988dd88495
commit 0b6f686b75
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/ChangeLog
View File

@ -1,3 +1,8 @@
Mon Apr 16 12:18:26 2001 Owen Taylor <otaylor@redhat.com>
* {glib,gobject}/Makefile.am (tmpl-build.stamp): More tweaks
from GTK+. Reenable $(HTML_IMAGES) with shell portability fixes.
Wed Apr 4 00:56:00 2001 Tim Janik <timj@gtk.org> Wed Apr 4 00:56:00 2001 Tim Janik <timj@gtk.org>
* gobject/Makefile.am: disabled "for i in $(HTML_IMAGES) ;" * gobject/Makefile.am: disabled "for i in $(HTML_IMAGES) ;"

13
docs/reference/glib/Makefile.am
View File

@ -88,14 +88,14 @@ all-local: html-build.stamp
scan-build.stamp: $(HFILE_GLOB) scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***' @echo '*** Scanning header files ***'
cd $(srcdir) && ( \ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
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) --output-dir=$(srcdir) ; \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
else \ else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \ for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \ test -f $$i || touch $$i ; \
done \ done \
fi ) fi
cd $(srcdir) && \ cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp touch scan-build.stamp
@ -175,10 +175,11 @@ dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/html mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-cp $(srcdir)/html/index.sgml $(distdir)/html -cp $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
for i in $(HTML_IMAGES) ; do \
images=$(HTML_IMAGES) ; \
for i in $$images ; do \
cp $(srcdir)/$$i $(distdir)/html ; \ cp $(srcdir)/$$i $(distdir)/html ; \
done done

1
docs/reference/glib/tmpl/macros_misc.sgml
View File

@ -66,7 +66,6 @@ only one statement is expected by the compiler.
Portable way to copy <type>va_list</type> variables. Portable way to copy <type>va_list</type> variables.
</para> </para>
<!-- # Unused Parameters # -->
@ap1: the <type>va_list</type> variable to place a copy of @ap2 in. @ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
@ap2: a <type>va_list</type>. @ap2: a <type>va_list</type>.

16
docs/reference/gobject/Makefile.am
View File

@ -78,14 +78,14 @@ all-local: html-build.stamp
scan-build.stamp: $(HFILE_GLOB) scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***' @echo '*** Scanning header files ***'
cd $(srcdir) && ( \ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
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) --output-dir=$(srcdir) ; \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) ; \
else \ else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \ for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \ test -f $$i || touch $$i ; \
done \ done \
fi ) fi
cd $(srcdir) && \ cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp touch scan-build.stamp
@ -165,12 +165,12 @@ dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/html mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
-cp $(srcdir)/html/index.sgml $(distdir)/html -cp $(srcdir)/html/index.sgml $(distdir)/html
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
# for i in $(HTML_IMAGES) ; do \ images=$(HTML_IMAGES) ; \
# cp $(srcdir)/$$i $(distdir)/html ; \ for i in $$images ; do \
# done cp $(srcdir)/$$i $(distdir)/html ; \
done
.PHONY : dist-hook-local .PHONY : dist-hook-local