Rename transparent support to overlay This affects the pkg-config file now named libbsd-overlay.pc, and the macro to use the overlay LIBBSD_OVERLAY.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219
diff --git a/Makefile b/Makefile
index 5a04ae3..23648e1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ LIB_VERSION_MICRO := 0
LIB_VERSION := $(LIB_VERSION_MAJOR).$(LIB_VERSION_MINOR).$(LIB_VERSION_MICRO)
LIB_PKGCONFIG := $(LIB_NAME).pc
-LIB_PKGCONFIG_TRANS := $(LIB_NAME)-transparent.pc
+LIB_PKGCONFIG_OVERLAY := $(LIB_NAME)-overlay.pc
LIB_STATIC := $(LIB_NAME).a
LIB_SHARED_SO := $(LIB_NAME).so
LIB_SONAME := $(LIB_SHARED_SO).$(LIB_VERSION_MAJOR)
@@ -127,7 +127,7 @@ LDFLAGS ?=
# Internal makefile variables
MK_CPPFLAGS := -Iinclude/bsd/ -Iinclude/ \
- -DLIBBSD_TRANSPARENT -DLIBBSD_CLEAN_INCLUDES \
+ -DLIBBSD_OVERLAY -DLIBBSD_CLEAN_INCLUDES \
-D_GNU_SOURCE -D__REENTRANT
MK_CFLAGS :=
MK_LDFLAGS :=
@@ -144,7 +144,7 @@ pkgconfigdir = ${usrlibdir}/pkgconfig
mandir = ${prefix}/share/man
.PHONY: libs
-libs: $(LIB_STATIC) $(LIB_SHARED_SO) $(LIB_PKGCONFIG) $(LIB_PKGCONFIG_TRANS)
+libs: $(LIB_STATIC) $(LIB_SHARED_SO) $(LIB_PKGCONFIG) $(LIB_PKGCONFIG_OVERLAY)
.PHONY: man
man: $(LIB_MANS)
@@ -214,7 +214,7 @@ install: libs man
done
install -m644 $(LIB_MANS) $(DESTDIR)$(mandir)/man3
install -m644 $(LIB_PKGCONFIG) $(DESTDIR)$(pkgconfigdir)
- install -m644 $(LIB_PKGCONFIG_TRANS) $(DESTDIR)$(pkgconfigdir)
+ install -m644 $(LIB_PKGCONFIG_OVERLAY) $(DESTDIR)$(pkgconfigdir)
ifeq ($(libdir),$(usrlibdir))
# If both dirs are the same, do a relative symlink.
ln -sf $(LIB_SHARED) $(DESTDIR)$(usrlibdir)/$(LIB_SHARED_SO)
@@ -227,7 +227,7 @@ endif
.PHONY: clean
clean:
rm -f $(LIB_PKGCONFIG)
- rm -f $(LIB_PKGCONFIG_TRANS)
+ rm -f $(LIB_PKGCONFIG_OVERLAY)
rm -f $(LIB_SRCS_GEN) $(LIB_MANS_GEN)
rm -f $(LIB_STATIC_OBJS)
rm -f $(LIB_STATIC)
diff --git a/include/bsd/err.h b/include/bsd/err.h
index b622655..def4ac3 100644
--- a/include/bsd/err.h
+++ b/include/bsd/err.h
@@ -1,6 +1,6 @@
/*
* Copyright © 2006 Robert Millan
- * Copyright © 2009 Guillem Jover
+ * Copyright © 2009, 2011 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
#include <stdarg.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <err.h>
#else
#include <err.h>
diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index b0057cf..d2963cb 100644
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -1,6 +1,6 @@
/*
* Copyright © 2006 Robert Millan
- * Copyright © 2009 Guillem Jover
+ * Copyright © 2009, 2011 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <getopt.h>
#else
#include <getopt.h>
diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
index cdf4e50..db2823e 100644
--- a/include/bsd/stdio.h
+++ b/include/bsd/stdio.h
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <stdio.h>
#else
#include <stdio.h>
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 4a185fc..a22cbe5 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -33,14 +33,14 @@
#include <sys/stat.h>
#include <stdint.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <stdlib.h>
#else
#include <stdlib.h>
#endif
/* For compatibility with NetBSD, which defines humanize_number here. */
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include <libutil.h>
#else
#include <bsd/libutil.h>
diff --git a/include/bsd/string.h b/include/bsd/string.h
index f9e733f..7d23f7d 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2004, 2005, 2009 Guillem Jover
+ * Copyright © 2004, 2005, 2009, 2011 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <string.h>
#else
#include <string.h>
diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
index 87d8a48..b1a0f8a 100644
--- a/include/bsd/sys/cdefs.h
+++ b/include/bsd/sys/cdefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2004, 2005, 2006, 2009 Guillem Jover
+ * Copyright © 2004-2006, 2009-2011 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
#ifndef LIBBSD_CDEFS_H
#define LIBBSD_CDEFS_H
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <sys/cdefs.h>
#else
#include <sys/cdefs.h>
diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index ac56787..61aaff4 100644
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2008, 2009 Guillem Jover
+ * Copyright © 2008-2011 Guillem Jover
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#include <sys/stat.h>
-#ifdef LIBBSD_TRANSPARENT
+#ifdef LIBBSD_OVERLAY
#include_next <unistd.h>
#else
#include <unistd.h>
diff --git a/libbsd-overlay.pc.in b/libbsd-overlay.pc.in
new file mode 100644
index 0000000..2bbb1e2
--- /dev/null
+++ b/libbsd-overlay.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libbsd
+Description: Utility functions from BSD systems (overlay)
+Version: @VERSION@
+URL: http://libbsd.freedesktop.org/
+Libs: -L${libdir} -lbsd
+Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY
diff --git a/libbsd-transparent.pc.in b/libbsd-transparent.pc.in
deleted file mode 100644
index 2549e1c..0000000
--- a/libbsd-transparent.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libbsd
-Description: Utility functions from BSD systems (transparent)
-Version: @VERSION@
-URL: http://libbsd.freedesktop.org/
-Libs: -L${libdir} -lbsd
-Cflags: -isystem ${includedir}/bsd -DLIBBSD_TRANSPARENT