From: Niki Roo <niki@nikiroo.be>
Date: Tue, 2 Jul 2024 15:56:31 +0000 (+0200)
Subject: Merge branch 'c-master' of git.nikiroo.be:workspace/template
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=380dbcc2ba18a4cf334cfe7ed3d6ca5120a0c84c;p=cbook.git

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

380dbcc2ba18a4cf334cfe7ed3d6ca5120a0c84c
diff --cc Doxyfile
index a72e265,cd944e0..10d0e2a
--- a/Doxyfile
+++ b/Doxyfile
@@@ -1,5 -1,14 +1,14 @@@
  # Doxyfile 1.8.13
  
+ # Minimum required fields:
 -PROJECT_NAME           = "Program name"
 -PROJECT_BRIEF          = "Small description"
 -INPUT                  = src/xxx 
++PROJECT_NAME           = "CBook"
++PROJECT_BRIEF          = "PL/1 data files / CSV conversion utility"
++INPUT                  = src/cbook
+ 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 51306d4,790beea..14e6b85
--- a/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   = cbook
 +NAMES  = $(NAME) cutils
 +TESTS  = tests-cbook
  
+ ################################################################################
+ 
  # You may override these when calling make
  PREFIX = /usr/local
  dstdir = bin
diff --cc README.md
index 0b21b29,2e797e4..c3890ec
--- a/README.md
+++ b/README.md
@@@ -4,4 -4,33 +4,35 @@@ PL/1 data files to CSV conversion utili
  
  ## Synopsis
  
- Todo.
 -- `program --help`
++- `cbook --help`
+ 
+ ## Description
+ 
 -Long description multiple paragraphs are ok.
++PL/1 data files to CSV conversion utility.
++
++Works with EBCDIC data and PL/1 books.
+ 
+ ## Options
+ 
+ - **--help** (or **-h**): information about the syntax
+ 
+ ## Compilation
+ 
+ Just run `make`.  
+ 
+ You can also use those make targets:
+ 
+ - `make doc`: build the Doxygen documentation (`doxygen` required)
+ - `make man`: build the man page (`pandoc` required)
+ - `make install PREFIX=/usr/local`: install the program into PREFIX (default is `/usr/local`) and the manual if built
+ - `make uninstall PREFIX=/usr/local`: uninstall the program from the given PREFIX
+ - `make clear`: clear the temporary files
+ - `make mrpropre`: clear everything, including the main executable and the documentation
+ - `make test`: build the unit tests (`check` required)
+ - `make run-test`: start the unit tests
+ - `make run-test-more`: start the extra unit tests (can be long)
+ 
+ ## Author
+ 
 -Program was written by Niki Roo <niki@nikiroo.be>
++CBook was written by Niki Roo <niki@nikiroo.be>
+ 
diff --cc src/cutils
index 780c8d0,0000000..8cf0ab8
mode 160000,000000..160000
--- a/src/cutils
+++ b/src/cutils
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit 780c8d0590a2f34e68ff896058b3b1a89539dcd8
++Subproject commit 8cf0ab8f25623889760fef03414c476c1cc19613