diff options
| author | Dan Winship <danw@src.gnome.org> | 2008-03-29 19:43:07 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2008-03-29 19:43:07 +0000 |
| commit | 14a6c55e0008ad6bfdd326298cae1d52df9c526a (patch) | |
| tree | 51ee99c57f13932b0a1cf9443cab3ae23fc66807 /gtk-doc.make | |
| parent | 59247b1f7ca8e79eab22f04106f243b32248243c (diff) | |
| download | libsoup-14a6c55e0008ad6bfdd326298cae1d52df9c526a.tar.gz libsoup-14a6c55e0008ad6bfdd326298cae1d52df9c526a.tar.bz2 libsoup-14a6c55e0008ad6bfdd326298cae1d52df9c526a.zip | |
update to latest
svn path=/trunk/; revision=1116
Diffstat (limited to 'gtk-doc.make')
| -rw-r--r-- | gtk-doc.make | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk-doc.make b/gtk-doc.make index 354ffb7c..6a30ea1d 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -5,11 +5,11 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) endif # We set GPATH here; this gives us semantics for GNU make @@ -128,7 +128,7 @@ maintainer-clean-local: clean cd $(srcdir) && rm -rf xml html install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ + installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -139,8 +139,8 @@ install-data-local: done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + (which gtkdoc-rebase >& /dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \ fi @@ -165,8 +165,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ cd $(distdir) && rm -f $(DISTCLEANFILES) -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html |