X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=0674495fe2ad81c70686682a69796aaf809e26c3;hp=9c34d749eb4071ed43c5a0dd650adcf4c7ef3411;hb=aaedc06d0448b048c7d41074985f9ee81e93d077;hpb=201ba21a594fe7a1392bf1548b6c9a86ce572508

diff --git a/Makefile b/Makefile
index 9c34d74..0674495 100644
--- a/Makefile
+++ b/Makefile
@@ -78,6 +78,11 @@ ifeq ($(uname_s),NetBSD)
 	LDFLAGS += -Wl,-soname,$(soname)
 endif
 
+ifeq ($(uname_s),FreeBSD)
+	format := elf
+	LDFLAGS += -Wl,-soname,$(soname)
+endif
+
 ifeq ($(format),elf)
 	# On ELf-based systems, the following conventions apply (see dhweeler's
 	# Program Library HOWTO):
@@ -109,7 +114,7 @@ osl.c fsck.c:
 fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $<
 
-%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h
+%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h osl.h errtab.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 %.o: %.c Makefile errtab.h
@@ -140,12 +145,16 @@ osl_errors.h: errlist
 		-e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
-	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@
+	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/OSL_ERROR(E_OSL_\1, \2)/g' $< > $@
 
 osl.h: osl.h.in osl_errors.h Makefile
-	cat osl.h.in osl_errors.h > $@
+	echo '#ifndef _OSL_H' > $@
+	echo '#define _OSL_H' >> $@
+	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
+	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h \
+		fsck.cmdline.c oslfsck
 
 install: all
 	$(MKDIR) $(libdir) $(includedir)