generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-09 19:27:42 +01:00
Code Issues Projects Releases Wiki Activity

Rename transparent support to overlay

Browse Source 
This affects the pkg-config file now named libbsd-overlay.pc, and the
macro to use the overlay LIBBSD_OVERLAY.
This commit is contained in:
Guillem Jover 2011-05-25 07:36:19 +02:00
parent 94fe901eda
commit 17a9a8472e
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -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)

4
include/bsd/err.h
View File

@ -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>

4
include/bsd/getopt.h
View File

@ -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>

2
include/bsd/stdio.h
View File

@ -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>

4
include/bsd/stdlib.h
View File

@ -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>

4
include/bsd/string.h
View File

@ -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>

4
include/bsd/sys/cdefs.h
View File

@ -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>

4
include/bsd/unistd.h
View File

@ -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>

4
libbsd-transparent.pc.in → libbsd-overlay.pc.in
View File

@ -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