Append NEWS file to the manual

2 files changed, 21 insertions, 23 deletions

diff --git a/NEWS b/NEWS
index ce5015f..035d790 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,10 @@
+Changelog
+=========
+
 Changes in libuca 1.2
-=====================
+---------------------
 
-API break
----------
+### API break
 
 The interface of uca_camera_grab() has changed. The buffer must be provided as a
 void pointer (or gpointer in GLib speak), _not_ the address of a void pointer.
@@ -14,15 +16,13 @@ instantiates it via the GInitable initialization function. Therefore, all
 plugins must implement initialization code in the objects init function and flag
 errors in the init method from the GInitable interface.
 
-Restructuring of tools
-----------------------
+### Restructuring of tools
 
 All binary sources are now found in bin/, with the GUI application now
 split off from the command line tools. Also, all tools are now installed with
 a common "uca-" prefix, e.g. `uca-control` and `uca-grab`.
 
-Minor changes
--------------
+### Minor changes
 
 - Improved plugin packaging: Plugins can now specify a version number
   independent of libuca which is reflected when building RPM packages.
@@ -33,10 +33,9 @@ Minor changes
 
 
 Changes in libuca 1.1
-=====================
+---------------------
 
-Plugin System
--------------
+### Plugin System
 
 A new plugin manager is used to instantiate camera objects from a shared
 library. Instead of calling `uca_camera_new`, a plugin manager is created that
@@ -52,8 +51,7 @@ looks in pre- and user-defined directories for DSOs that match
 The plugin manager adds a dependency on GModule (pkg-config package
 `gmodule-2.0`) that is part of GLib.
 
-Minor changes
--------------
+### Minor changes
 
 - It is now possible to generate GObject introspection meta data to bind libuca
   to all languages that support GObject introspection. A first experiment of
@@ -73,10 +71,9 @@ Minor changes
 
 
 Changes in libuca 1.0 aka 0.6
-=============================
+-----------------------------
 
-GObject Type System
--------------------
+### GObject Type System
 
 Instead of using a home-grown type and class system, we switched to the GObject
 system as part of GLib. This effort has the advantage of much more typesafe
@@ -87,8 +84,7 @@ instead of trying to initialize each camera first and having the user decide
 what to use, the user must now determine the used camera at compile time or use
 the factory pattern to delegate this to run-time. 
 
-Tango Wrapper
--------------
+### Tango Wrapper
 
 The old Tango wrapper has been superseded by a generic one that proxies
 GObject's to the Tango bus. This makes things a lot easier, for example reacting
@@ -98,7 +94,7 @@ The wrapper is developed as an external project at ISS by Volker Kaiser.
 
 
 Changes in libuca 0.5.0
-=======================
+-----------------------
 
 - Put work under LGPL 2.1
 
@@ -113,4 +109,3 @@ Changes in libuca 0.5.0
 
 - New symbols:
     - uca_cam_release_buffer()
-    
diff --git a/docs/Makefile b/docs/Makefile
index 53dc6fd..ededfe8 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,5 +1,8 @@
 PANDOC=$(shell which pandoc)
 OPTS=-s --smart --toc
+MANUAL=manual.md
+NEWS=../NEWS
+INPUTS=$(MANUAL) $(NEWS)
 
 all: pdf html
 
@@ -10,11 +13,11 @@ html: manual.html
 clean:
 	rm -f manual.pdf manual.html
 
-manual.pdf: manual.md
-	$(PANDOC) $(OPTS) manual.md -o manual.pdf
+manual.pdf: $(INPUTS)
+	$(PANDOC) $(OPTS) $(INPUTS) -o $@
 
-manual.html: manual.md style.css
-	$(PANDOC) $(OPTS) manual.md -H webfonts.html -c style.css -o manual.html
+manual.html: $(INPUTS) style.css
+	$(PANDOC) $(OPTS) $(INPUTS) -H webfonts.html -c style.css -o $@
 
 ifeq ($(PANDOC),)
 	$(warning Pandoc not found!)