projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops, forgot part of the patch. Same ChangeLog entry.
[platform/upstream/dbus.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
200ee64
..
816d653
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-6,14
+6,20
@@
endif
if HAVE_QT
QT_SUBDIR=qt
if HAVE_QT
QT_SUBDIR=qt
+ QT_PC=dbus-qt4-1.pc
+endif
+
+if HAVE_QT3
+ QT3_SUBDIR=qt3
endif
if DBUS_USE_GCJ
GCJ_SUBDIR=gcj
endif
endif
if DBUS_USE_GCJ
GCJ_SUBDIR=gcj
endif
-if DBUS_USE_
MCS
+if DBUS_USE_
CSC
MONO_SUBDIR=mono
MONO_SUBDIR=mono
+ MONO_PC=dbus-sharp.pc
endif
if HAVE_PYTHON
endif
if HAVE_PYTHON
@@
-27,19
+33,24
@@
dist-local:
echo "You have to build with Qt and GLib to make dist" ; \
fi
echo "You have to build with Qt and GLib to make dist" ; \
fi
-SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(PYTHON_SUBDIR) test tools
+SUBDIRS=dbus bus doc $(GLIB_SUBDIR) $(GCJ_SUBDIR) $(MONO_SUBDIR) $(QT_SUBDIR) $(QT3_SUBDIR) $(PYTHON_SUBDIR) tools test
+DIST_SUBDIRS=dbus bus doc glib qt qt3 gcj mono python tools test
pkgconfigdir = $(libdir)/pkgconfig
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dbus-1.pc $(GLIB_PC)
+pkgconfig_DATA = dbus-1.pc $(GLIB_PC)
$(QT_PC) $(MONO_PC)
DISTCLEANFILES = \
dbus-1.pc \
DISTCLEANFILES = \
dbus-1.pc \
- $(GLIB_PC)
+ $(GLIB_PC) \
+ $(QT_PC) \
+ $(MONO_PC)
EXTRA_DIST = \
HACKING \
dbus-1.pc.in \
EXTRA_DIST = \
HACKING \
dbus-1.pc.in \
- dbus-glib-1.pc.in
+ dbus-glib-1.pc.in \
+ dbus-qt4-1.pc.in \
+ dbus-sharp.pc.in
all-local: Doxyfile
all-local: Doxyfile
@@
-47,15
+58,24
@@
if DBUS_GCOV_ENABLED
clean-gcov:
find -name "*.da" -o -name "*.gcov" | xargs rm || true
clean-gcov:
find -name "*.da" -o -name "*.gcov" | xargs rm || true
+clean-bbg:
+ find -name "*.bbg" -o -name "*.bb" | xargs rm || true
+
+GCOV_DIRS=dbus bus $(GLIB_SUBDIR) $(QT_SUBDIR)
+
## .PHONY so it always rebuilds it
.PHONY: coverage-report.txt
coverage-report.txt:
## .PHONY so it always rebuilds it
.PHONY: coverage-report.txt
coverage-report.txt:
-
GCOV_FILES=`find dbus bus $(GLIB_SUBDIR) $(QT_SUBDIR) -name "*.bbg"` ;
\
+
BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg" -o -name "*.gcno"` ;
\
C_FILES= ; \
C_FILES= ; \
- for F in $$GCOV_FILES; do \
- C=`echo $$F | sed -e 's/.bbg/.c/g'` ; \
+ for F in $$BBG_FILES ; do \
+ F_nolibs=`echo $$F | sed -e 's/.libs\///g'` ; \
+ C=`echo $$F_nolibs | sed -e 's/.bbg/.c/g' | sed -e 's/.gcno/.c/g'` ; \
+ B=`basename $$F .bbg` ; \
+ D=`dirname $$F` ; \
DA=`echo $$F | sed -e 's/.bbg/.da/g'` ; \
DA=`echo $$F | sed -e 's/.bbg/.da/g'` ; \
- if test -e $$DA ; then \
+ DA_libs=`echo $$D/.libs/$$B/.da` ; \
+ if test -e $$DA || test -e $$DA_libs; then \
C_FILES="$$C_FILES $$C" ; \
fi ; \
done ; \
C_FILES="$$C_FILES $$C" ; \
fi ; \
done ; \