From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 3 Jun 2019 12:05:10 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/lopsub'
X-Git-Tag: v0.2.0~10^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=9aadc0af8df91d309f9f701f07a6db0542341618;hp=-c

Merge branch 'refs/heads/t/lopsub'

* refs/heads/t/lopsub:
  Convert oslfsck to lopsub.

The merge conflicted twice for the Makefile because of commit
ec08b17c7514 which touched the object list of oslfsck and added
-DVERSION to the CPPFLAGs. This was easy to fix, though.
---

9aadc0af8df91d309f9f701f07a6db0542341618
diff --combined Makefile
index 25b06ea,a4f5fad..7ce4493
--- a/Makefile
+++ b/Makefile
@@@ -6,7 -6,7 +6,7 @@@ bindir := $(PREFIX)/bi
  mandir := $(PREFIX)/man/man1
  
  objects := osl.o util.o rbtree.o sha1.o
- fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o fsck.cmdline.o
 -fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o oslfsck.lsg.o
++fsck_objects := fsck.o osl.o util.o rbtree.o sha1.o oslfsck.lsg.o
  headers := osl.h
  executables := oslfsck
  man_pages := oslfsck.1
@@@ -29,8 -29,6 +29,8 @@@ z := 
  VERSION := $(x).$(y).$(z)
  
  # common flags
- CPPFLAGS += -DVERSION='"$(VERSION)"'
++CPPFLAGS += -DOSL_VERSION='"$(VERSION)"'
 +
  CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  CFLAGS += -Wredundant-decls
  CFLAGS += -Os
@@@ -121,28 -119,23 +121,20 @@@ osl.c fsck.c
  
  -include Makefile.deps
  
- fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
- 	$(CC) $(CPPFLAGS) -c $<
 -%.fsck.o: %.c Makefile osl.h errtab.h oslfsck.lsg.h
 -	$(CC) -c -DOSL_VERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
--
  %.o: %.c Makefile errtab.h
  	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
  
- fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
- 	gengetopt \
- 		--conf-parser \
- 		--unamed-opts=table \
- 		--no-handle-version \
- 		--file-name=fsck.cmdline \
- 		--func-name=fsck_cmdline_parser \
- 		--set-package="oslfsck" \
- 		--arg-struct-name=fsck_args_info \
- 		< $<
- 
  oslfsck: $(fsck_objects)
- 	$(CC) -o $@ $(fsck_objects)
+ 	$(CC) -o $@ $(fsck_objects) -llopsub
+ 
+ %.lsg.c: %.suite
+ 	lopsubgen --gen-c < $<
+ 
+ %.lsg.h: %.suite
+ 	lopsubgen --gen-header < $<
  
- oslfsck.1: oslfsck
- 	help2man -h --detailed-help -N ./$< > $@
+ %.1: %.suite
+ 	lopsubgen --gen-man=$@ < $<
  
  $(realname): $(objects)
  	$(CC) $(LDFLAGS) -o $@ $(objects)
@@@ -171,8 -164,8 +163,8 @@@ osl.h: osl.h.in osl_errors.h Makefil
  	cat osl.h.in osl_errors.h >> $@
  	echo '#endif /* _OSL_H */' >> $@
  clean:
- 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
- 		fsck.cmdline.c oslfsck *.a *.ga *.sym
+ 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h \
+ 		oslfsck *.a *.ga *.sym *.lsg.*
  
  distclean: clean
  	rm -f web/index.html web/oslfsck.1.html web/osl.png