Merge branch 'mer1854_do_not_hardcode' into 'master'

Add missing D-Bus method call and signal names

See merge request !7

Doxyfile

@@ -272,22 +272,6 @@ SUBGROUPING            = YES
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -396,7 +380,7 @@ INLINE_INFO            = YES
 # alphabetically by member name. If set to NO the members will appear in 
 # declaration order.
 
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
 # brief documentation of file, namespace and class members alphabetically 
@@ -466,12 +450,6 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
 # This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
@@ -564,7 +542,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = 
+INPUT                  = include/mce
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -792,12 +770,6 @@ HTML_FOOTER            =
 
 HTML_STYLESHEET        = 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -1133,18 +1105,6 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1354,7 +1314,7 @@ HAVE_DOT               = NO
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
 # containing the font.
 
-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           =
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.

Makefile

@@ -5,38 +5,68 @@
 # Author: David Weinehall <david.weinehall@nokia.com>
 # Modified by: Ilya Dogolazky, Tuomo Tanskanen
 
-INSTALL_DIR := install -d
+# ----------------------------------------------------------------------------
+# TOP LEVEL TARGETS
+# ----------------------------------------------------------------------------
+
+.PHONY: build doc install clean distclean mostlyclean
+
+build::
+
+doc::
+
+install::
+
+mostlyclean::
+	$(RM) *.bak *~
+	$(RM) mce/include/*.bak mce/include/*~
+
+clean:: mostlyclean
+
+distclean:: clean
+
+# ----------------------------------------------------------------------------
+# INSTALL CONFIG
+# ----------------------------------------------------------------------------
+
+DESTDIR    ?= /tmp/test-mce-dev
+
+PCDIR      := /usr/lib/pkgconfig
+INCLUDEDIR := /usr/include/mce
+
+INSTALL_DIR  := install --mode=755 --directory
 INSTALL_DATA := install --mode=644
 
-DOXYGEN := doxygen
 
-PCDIR := $(DESTDIR)/usr/lib/pkgconfig
-INCLUDEDIR := $(DESTDIR)/usr/include/mce
+# ----------------------------------------------------------------------------
+# FILES TO BUILD / INSTALL
+# ----------------------------------------------------------------------------
 
-TOPDIR := $(shell /bin/pwd)
-INCDIR := $(TOPDIR)/include/mce
-DOCDIR := $(TOPDIR)/doc
+PCFILE  += mce.pc
+INCLUDE_FILES += include/mce/dbus-names.h
+INCLUDE_FILES += include/mce/mode-names.h
 
-PCFILE  := mce.pc
-INCLUDE_FILES := $(INCDIR)/dbus-names.h $(INCDIR)/mode-names.h
+# ----------------------------------------------------------------------------
+# DOCUMENTATION RULES
+# ----------------------------------------------------------------------------
 
-.PHONY: doc
-doc:	doc/warnings
+doc::	doc/doxygen.log
 
-doc/warnings: $(INCLUDE_FILES) Doxyfile
-	@if [ ! -d "$(DOCDIR)" ]; then mkdir "$(DOCDIR)"; fi
-	@$(DOXYGEN) 2> $(TOPDIR)/doc/warnings > /dev/null
+doc/doxygen.log: $(INCLUDE_FILES) Doxyfile
+	mkdir -p doc
+	doxygen 1> $@ # stdout=noise stderr=warnings
 
-clean:
-	@if [ x"$(DOCDIR)" != x"" ]; then	\
-		rm -rf "$(DOCDIR)";		\
-	fi
+clean::
+	$(RM) -rf doc
 
-.PHONY: install
-install: doc
-	$(INSTALL_DIR) $(PCDIR) $(INCLUDEDIR)				&&\
-	$(INSTALL_DATA) $(PCFILE) $(PCDIR)				&&\
-	$(INSTALL_DATA) $(INCLUDE_FILES) $(INCLUDEDIR)
+# ----------------------------------------------------------------------------
+# INSTALL RULES
+# ----------------------------------------------------------------------------
 
-.PHONY: distclean
-distclean: clean
+install::
+	# package config files
+	$(INSTALL_DIR) $(DESTDIR)$(PCDIR)
+	$(INSTALL_DATA) $(PCFILE) $(DESTDIR)$(PCDIR)/
+	# header files
+	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $(INCLUDE_FILES) $(DESTDIR)$(INCLUDEDIR)