From 17a9a8472ec3f9a40ab2fcf2e21f1fa9468e0288 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 25 May 2011 07:36:19 +0200 Subject: [PATCH] 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. --- Makefile | 10 +++++----- include/bsd/err.h | 4 ++-- include/bsd/getopt.h | 4 ++-- include/bsd/stdio.h | 2 +- include/bsd/stdlib.h | 4 ++-- include/bsd/string.h | 4 ++-- include/bsd/sys/cdefs.h | 4 ++-- include/bsd/unistd.h | 4 ++-- libbsd-transparent.pc.in => libbsd-overlay.pc.in | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) rename libbsd-transparent.pc.in => libbsd-overlay.pc.in (59%) 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 -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include 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 -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include 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 #include -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include 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 #include -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include #endif /* For compatibility with NetBSD, which defines humanize_number here. */ -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include #else #include 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 #include -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include 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 #else #include 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 #include -#ifdef LIBBSD_TRANSPARENT +#ifdef LIBBSD_OVERLAY #include_next #else #include diff --git a/libbsd-transparent.pc.in b/libbsd-overlay.pc.in similarity index 59% rename from libbsd-transparent.pc.in rename to libbsd-overlay.pc.in index 2549e1c..2bbb1e2 100644 --- a/libbsd-transparent.pc.in +++ b/libbsd-overlay.pc.in @@ -4,8 +4,8 @@ libdir=@libdir@ includedir=@includedir@ Name: libbsd -Description: Utility functions from BSD systems (transparent) +Description: Utility functions from BSD systems (overlay) Version: @VERSION@ URL: http://libbsd.freedesktop.org/ Libs: -L${libdir} -lbsd -Cflags: -isystem ${includedir}/bsd -DLIBBSD_TRANSPARENT +Cflags: -isystem ${includedir}/bsd -DLIBBSD_OVERLAY