d53a51f041
-main, the main libcanberra library
-gtk, libcanberra-gtk (gtk+2)
-gtk3 libcanberra-gtk3 (gtk+3)
This is needed for the ongoing GNOME3 work without forcing a global move
to gtk+3. The -gtk subpackage may disappear in the future when nothing
uses it.
This move will prevent the login/logout sounds to work in
gnome-session-2.X but it is a necessary evil to move forward.
EDONOTCARE/agreed by several
68 lines
1.9 KiB
Plaintext
68 lines
1.9 KiB
Plaintext
$OpenBSD: patch-gtkdoc_gtk-doc_make,v 1.3 2011/04/13 06:47:22 ajacoutot Exp $
|
|
--- gtkdoc/gtk-doc.make.orig Thu Feb 24 23:06:45 2011
|
|
+++ gtkdoc/gtk-doc.make Tue Apr 12 15:02:53 2011
|
|
@@ -4,15 +4,15 @@
|
|
# Everything below here is generic #
|
|
####################################
|
|
|
|
-if GTK_DOC_USE_LIBTOOL
|
|
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+#if GTK_DOC_USE_LIBTOOL
|
|
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
|
|
GTKDOC_RUN = $(LIBTOOL) --mode=execute
|
|
-else
|
|
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
|
|
-GTKDOC_RUN =
|
|
-endif
|
|
+#else
|
|
+#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
|
+#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
|
|
+#GTKDOC_RUN = sh -c
|
|
+#endif
|
|
|
|
# We set GPATH here; this gives us semantics for GNU make
|
|
# which are more like other make's VPATH, when it comes to
|
|
@@ -48,22 +48,7 @@ REPORT_FILES = \
|
|
|
|
CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
|
|
|
|
-if ENABLE_GTK_DOC
|
|
-if GTK_DOC_BUILD_HTML
|
|
-HTML_BUILD_STAMP=html-build.stamp
|
|
-else
|
|
-HTML_BUILD_STAMP=
|
|
-endif
|
|
-if GTK_DOC_BUILD_PDF
|
|
-PDF_BUILD_STAMP=pdf-build.stamp
|
|
-else
|
|
-PDF_BUILD_STAMP=
|
|
-endif
|
|
-
|
|
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
|
|
-else
|
|
all-local:
|
|
-endif
|
|
|
|
docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
|
|
|
|
@@ -209,13 +194,13 @@ uninstall-local:
|
|
#
|
|
# Require gtk-doc when making dist
|
|
#
|
|
-if ENABLE_GTK_DOC
|
|
+#if ENABLE_GTK_DOC
|
|
+#dist-check-gtkdoc:
|
|
+#else
|
|
dist-check-gtkdoc:
|
|
-else
|
|
-dist-check-gtkdoc:
|
|
@echo "*** gtk-doc must be installed and enabled in order to make dist"
|
|
@false
|
|
-endif
|
|
+#endif
|
|
|
|
dist-hook: dist-check-gtkdoc dist-hook-local
|
|
mkdir $(distdir)/html
|