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.tue.mpg.de/?a=commitdiff_plain;h=9aadc0af8df91d309f9f701f07a6db0542341618;p=osl.git

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 --cc 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,9 -119,9 +121,6 @@@ 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) $<