diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-04-27 10:30:47 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-04-27 10:30:47 +0000 |
| commit | b18e6175109cbc30f3b44a3473ce4a926cf3bfd4 (patch) | |
| tree | b4b59876437eca8aec063d4b2cfe100497d7713c | |
| parent | 73f7faa8cb025157e667a706d69338f8dba7dede (diff) | |
| download | libxklavier-b18e6175109cbc30f3b44a3473ce4a926cf3bfd4.tar.gz | |
update
| -rw-r--r-- | gtk-doc.make | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gtk-doc.make b/gtk-doc.make index f7c5178..354ffb7 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_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +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) else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(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,9 +139,8 @@ install-data-local: done; \ echo '-- Installing $(srcdir)/html/index.sgml' ; \ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - if test `which gtkdoc-rebase` != ""; then \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ fi @@ -166,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 |