Merge branch 'c-master' of git.nikiroo.be:workspace/template

diff --cc Doxyfile
index 6c00ef9a1933069e4d5d29c7c022a61559895268,cd944e02c5466d44dcba7949cacbe700f5ea3375..cdf7b0dd720da9d68b7a3c235be7497eadcc2cec
--- 1/Doxyfile
--- 2/Doxyfile
+++ b/Doxyfile
@@@ -1,5 -1,14 +1,14 @@@
  # Doxyfile 1.8.13
  
 -PROJECT_NAME           = "Program name"
 -PROJECT_BRIEF          = "Small description"
 -INPUT                  = src/xxx 
+ # Minimum required fields:
++PROJECT_NAME           = "NSub"
++PROJECT_BRIEF          = "Subtitle/lyrics conversion tool"
++INPUT                  = src/nsub
+ STRIP_FROM_PATH        = src
+ OPTIMIZE_OUTPUT_FOR_C  = YES
+ OPTIMIZE_OUTPUT_JAVA   = NO
+ FILE_PATTERNS          = *.h
+ 
  # This file describes the settings to be used by the documentation system
  # doxygen (www.doxygen.org) for a project.
  #

diff --cc Makefile
index 6f6ce65c9768d1d9744a4e709d15596f73c6b84f,790beea3a6d2827fa2cd1f954dfb320070ad34b9..455fe5f97ab1ad45874d06cf731b4b082c597448
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -4,10 -4,12 +4,12 @@@
  # > NAMES: list of all the programs to compile
  # > TESTS: list of all test programs to compile and run
  #
 -NAME   = program
 -NAMES  = $(NAME) program2
 -TESTS  = tests-program
 +NAME   = nsub
 +NAMES  = $(NAME) cutils
 +TESTS  = 
  
+ ################################################################################
+ 
  # You may override these when calling make
  PREFIX = /usr/local
  dstdir = bin