create lib/, man/ and $(program)/

45 files changed, 31 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 2cf6371..f0c255e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ localedir = /usr/share/locale
 version := $(shell dpkg-parsechangelog | grep '^Version' | cut -b10-)
 
 CC = gcc -std=gnu99
-CFLAGS = -g -Wall -DENABLE_L_DEBUG -D_GNU_SOURCE -DSYSCONF=\"$(sysconfdir)\" \
+CFLAGS = -g -Wall -Ilib \
+	 -DENABLE_L_DEBUG -D_GNU_SOURCE -DSYSCONF=\"$(sysconfdir)\" \
          -DHAVE_GETTEXT -DPACKAGE=\"dctrl-tools\" -DLOCALEDIR=\"$(localedir)\" 
 
 CFLAGS += -DVERSION=\"$(version)\"
@@ -15,12 +16,17 @@ CFLAGS += -DMAINTAINER='"$(shell grep ^Maintainer: debian/control | cut -b13-)"'
 #CFLAGS += -pg
 #LDFLAGS += -pg
 
-libobj = misc.o msg.o predicate.o util.o fsaf.o paragraph.o \
-         fieldtrie.o rc.o strutil.o getaline.o fnutil.o para_pool.o \
-	 ifile.o para_bundle.o sorter.o version.o
+libsrc = $(wildcard lib/*.c)
+libobj = $(libsrc:.c=.o)
 
-obj = $(libobj) grep-dctrl.o sort-dctrl.o tbl-dctrl.o
-src = $(obj:.o=.c)
+src = $(libsrc) \
+      $(wildcard grep-dctrl/*.c) \
+      $(wildcard sort-dctrl/*.c) \
+      $(wildcard tbl-dctrl/*.c)
+
+exe =  	grep-dctrl/grep-dctrl \
+	sort-dctrl/sort-dctrl \
+	tbl-dctrl/tbl-dctrl 
 
 LDLIBS = -L. -ldctrl
 
@@ -29,8 +35,10 @@ include langs.mk
 
 all :	all-no-mo mo
 
-all-no-mo : 	grep-dctrl sort-dctrl tbl-dctrl sync-available \
-		grep-dctrl.1 sort-dctrl.1
+all-no-mo :	sync-available/sync-available \
+		man/grep-dctrl.1 \
+		man/sort-dctrl.1 \
+		$(exe)
 
 pot : po/dctrl-tools.pot
 
@@ -38,14 +46,14 @@ po : $(foreach f,$(langs),po/$(f).po)
 
 mo : $(foreach f,$(langs),po/$(f).mo)
 
-grep-dctrl : grep-dctrl.o libdctrl.a
+grep-dctrl/grep-dctrl : grep-dctrl/grep-dctrl.o grep-dctrl/rc.o libdctrl.a
 
-sort-dctrl : sort-dctrl.o libdctrl.a
+sort-dctrl/sort-dctrl : sort-dctrl/sort-dctrl.o libdctrl.a
 
-tbl-dctrl : tbl-dctrl.o libdctrl.a
+tbl-dctrl/tbl-dctrl : tbl-dctrl/tbl-dctrl.o libdctrl.a
 
 % : %.o
-	$(CC) $(LDFLAGS) -o $@ $< $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 %.d: %.c
 	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
@@ -71,7 +79,7 @@ so/%.o : %.c
 %.1 : %.1.cp
 	sed 's*SYSCONF*$(sysconf)*' $< > $@
 
-sync-available : sync-available.cp
+sync-available/sync-available : sync-available/sync-available.cp
 	sed 's*VERSION*$(version)*' $< > $@
 	chmod 755 $@
 
@@ -91,7 +99,7 @@ po/dctrl-tools.pot : $(src)
 fsaf.test : fsaf.test.o msg.o
 
 clean :
-	$(RM) core grep-dctrl grep-dctrl.1 *.o so/*.o libdctrl.a libdctrl.so
+	$(RM) core $(exe) grep-dctrl.1 $(obj) so/*.o libdctrl.a libdctrl.so
 	$(RM) po/*.mo TAGS *.d
 	$(RM) sync-available
 
diff --git a/debian/rules b/debian/rules
index 7f114d2..8f77b2a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -46,27 +46,27 @@ debian/stamp/binary/dctrl-tools: debian/stamp/build
 #	  mandir=$(mandir) install
 #	Install configuration file
 	$(install_dir) $(etcdir)
-	$(install_nonex) grep-dctrl.rc $(etcdir)
+	$(install_nonex) grep-dctrl/grep-dctrl.rc $(etcdir)
 #	Install the binaries.
 	$(install_dir) $(sbindir)
-	$(install_script) sync-available $(sbindir)
+	$(install_script) sync-available/sync-available $(sbindir)
 	$(install_dir) $(bindir)
-	$(install_exec) tbl-dctrl $(bindir)
-	$(install_exec) sort-dctrl $(bindir)
-	$(install_exec) grep-dctrl $(bindir)
+	$(install_exec) tbl-dctrl/tbl-dctrl $(bindir)
+	$(install_exec) sort-dctrl/sort-dctrl $(bindir)
+	$(install_exec) grep-dctrl/grep-dctrl $(bindir)
 	set -e ; for dest in $(aliases) ; do \
 	   $(install_symlink) grep-dctrl $(bindir)/$$dest ; \
 	 done
 #	Install and zip the manual pages.
 	$(install_dir) $(man8dir)
-	$(install_nonex) sync-available.8 $(man8dir)/
+	$(install_nonex) man/sync-available.8 $(man8dir)/
 	$(gzip) $(man8dir)/sync-available.8
 	$(install_dir) $(man1dir)
-	$(install_nonex) sort-dctrl.1 $(man1dir)/
+	$(install_nonex) man/sort-dctrl.1 $(man1dir)/
 	$(gzip) $(man1dir)/sort-dctrl.1
-	$(install_nonex) tbl-dctrl.1 $(man1dir)/
+	$(install_nonex) man/tbl-dctrl.1 $(man1dir)/
 	$(gzip) $(man1dir)/tbl-dctrl.1
-	$(install_nonex) grep-dctrl.1 $(man1dir)/
+	$(install_nonex) man/grep-dctrl.1 $(man1dir)/
 	$(gzip) $(man1dir)/grep-dctrl.1
 	set -e ; for dest in $(aliases) ; do \
 	   $(install_symlink) grep-dctrl.1.gz $(man1dir)/$$dest.1.gz ; \
diff --git a/grep-dctrl.c b/grep-dctrl/grep-dctrl.c
index 687f8cf..687f8cf 100644
--- a/grep-dctrl.c
+++ b/grep-dctrl/grep-dctrl.c
diff --git a/grep-dctrl.rc b/grep-dctrl/grep-dctrl.rc
index 31e03b5..31e03b5 100644
--- a/grep-dctrl.rc
+++ b/grep-dctrl/grep-dctrl.rc
diff --git a/rc.c b/grep-dctrl/rc.c
index b94b669..b94b669 100644
--- a/rc.c
+++ b/grep-dctrl/rc.c
diff --git a/rc.h b/grep-dctrl/rc.h
index e112424..e112424 100644
--- a/rc.h
+++ b/grep-dctrl/rc.h
diff --git a/align.h b/lib/align.h
index 4acaa1b..4acaa1b 100644
--- a/align.h
+++ b/lib/align.h
diff --git a/fieldtrie.c b/lib/fieldtrie.c
index 250fc89..250fc89 100644
--- a/fieldtrie.c
+++ b/lib/fieldtrie.c
diff --git a/fieldtrie.h b/lib/fieldtrie.h
index 0e1c634..0e1c634 100644
--- a/fieldtrie.h
+++ b/lib/fieldtrie.h
diff --git a/fnutil.c b/lib/fnutil.c
index 1ec5ca4..1ec5ca4 100644
--- a/fnutil.c
+++ b/lib/fnutil.c
diff --git a/fnutil.h b/lib/fnutil.h
index c5e38f8..c5e38f8 100644
--- a/fnutil.h
+++ b/lib/fnutil.h
diff --git a/fsaf.c b/lib/fsaf.c
index 07a4979..07a4979 100644
--- a/fsaf.c
+++ b/lib/fsaf.c
diff --git a/fsaf.h b/lib/fsaf.h
index f95cf54..f95cf54 100644
--- a/fsaf.h
+++ b/lib/fsaf.h
diff --git a/getaline.c b/lib/getaline.c
index df02498..df02498 100644
--- a/getaline.c
+++ b/lib/getaline.c
diff --git a/getaline.h b/lib/getaline.h
index e7f60d1..e7f60d1 100644
--- a/getaline.h
+++ b/lib/getaline.h
diff --git a/i18n.h b/lib/i18n.h
index 67a3b5f..67a3b5f 100644
--- a/i18n.h
+++ b/lib/i18n.h
diff --git a/ifile.c b/lib/ifile.c
index b44b708..b44b708 100644
--- a/ifile.c
+++ b/lib/ifile.c
diff --git a/ifile.h b/lib/ifile.h
index 1405516..1405516 100644
--- a/ifile.h
+++ b/lib/ifile.h
diff --git a/misc.c b/lib/misc.c
index 1b299b6..1b299b6 100644
--- a/misc.c
+++ b/lib/misc.c
diff --git a/misc.h b/lib/misc.h
index 674f2b9..674f2b9 100644
--- a/misc.h
+++ b/lib/misc.h
diff --git a/msg.c b/lib/msg.c
index 85e8382..85e8382 100644
--- a/msg.c
+++ b/lib/msg.c
diff --git a/msg.h b/lib/msg.h
index bda8531..bda8531 100644
--- a/msg.h
+++ b/lib/msg.h
diff --git a/para_bundle.c b/lib/para_bundle.c
index d52edbf..d52edbf 100644
--- a/para_bundle.c
+++ b/lib/para_bundle.c
diff --git a/para_bundle.h b/lib/para_bundle.h
index 2cb8a63..2cb8a63 100644
--- a/para_bundle.h
+++ b/lib/para_bundle.h
diff --git a/para_pool.c b/lib/para_pool.c
index eb907ac..eb907ac 100644
--- a/para_pool.c
+++ b/lib/para_pool.c
diff --git a/para_pool.h b/lib/para_pool.h
index 9ec37f5..9ec37f5 100644
--- a/para_pool.h
+++ b/lib/para_pool.h
diff --git a/paragraph.c b/lib/paragraph.c
index 5dc06a4..5dc06a4 100644
--- a/paragraph.c
+++ b/lib/paragraph.c
diff --git a/paragraph.h b/lib/paragraph.h
index b3daafc..b3daafc 100644
--- a/paragraph.h
+++ b/lib/paragraph.h
diff --git a/predicate.c b/lib/predicate.c
index 67614cc..67614cc 100644
--- a/predicate.c
+++ b/lib/predicate.c
diff --git a/predicate.h b/lib/predicate.h
index 5860b6f..5860b6f 100644
--- a/predicate.h
+++ b/lib/predicate.h
diff --git a/sorter.c b/lib/sorter.c
index c8ae301..c8ae301 100644
--- a/sorter.c
+++ b/lib/sorter.c
diff --git a/sorter.h b/lib/sorter.h
index 7b3ada2..7b3ada2 100644
--- a/sorter.h
+++ b/lib/sorter.h
diff --git a/strutil.c b/lib/strutil.c
index 585abc1..585abc1 100644
--- a/strutil.c
+++ b/lib/strutil.c
diff --git a/strutil.h b/lib/strutil.h
index 431e9e1..431e9e1 100644
--- a/strutil.h
+++ b/lib/strutil.h
diff --git a/util.c b/lib/util.c
index bb69764..bb69764 100644
--- a/util.c
+++ b/lib/util.c
diff --git a/util.h b/lib/util.h
index 36293ae..36293ae 100644
--- a/util.h
+++ b/lib/util.h
diff --git a/version.c b/lib/version.c
index 624e089..624e089 100644
--- a/version.c
+++ b/lib/version.c
diff --git a/version.h b/lib/version.h
index 90aaf9d..90aaf9d 100644
--- a/version.h
+++ b/lib/version.h
diff --git a/grep-dctrl.1.cp b/man/grep-dctrl.1.cp
index bfa50c2..bfa50c2 100644
--- a/grep-dctrl.1.cp
+++ b/man/grep-dctrl.1.cp
diff --git a/sort-dctrl.1.cp b/man/sort-dctrl.1.cp
index 225cbd3..225cbd3 100644
--- a/sort-dctrl.1.cp
+++ b/man/sort-dctrl.1.cp
diff --git a/sync-available.8 b/man/sync-available.8
index a8fbbf9..a8fbbf9 100644
--- a/sync-available.8
+++ b/man/sync-available.8
diff --git a/tbl-dctrl.1 b/man/tbl-dctrl.1
index cca74ee..cca74ee 100644
--- a/tbl-dctrl.1
+++ b/man/tbl-dctrl.1
diff --git a/sort-dctrl.c b/sort-dctrl/sort-dctrl.c
index 725687c..725687c 100644
--- a/sort-dctrl.c
+++ b/sort-dctrl/sort-dctrl.c
diff --git a/sync-available.cp b/sync-available/sync-available.cp
index c833ac2..c833ac2 100644
--- a/sync-available.cp
+++ b/sync-available/sync-available.cp
diff --git a/tbl-dctrl.c b/tbl-dctrl/tbl-dctrl.c
index 0fca2ea..0fca2ea 100644
--- a/tbl-dctrl.c
+++ b/tbl-dctrl/tbl-dctrl.c