Remove the libatf library and add libatf-c and libatf-c++; per import of
atf-0.5.
This commit is contained in:
jmmv
parent
aee69d536e
commit
2a6dead6fc
@ -1,9 +1,10 @@
|
||||
# $NetBSD: Makefile,v 1.122 2008/03/22 08:37:26 mlelstv Exp $
|
||||
# $NetBSD: Makefile,v 1.123 2008/05/01 15:33:33 jmmv Exp $
|
||||
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
SUBDIR= csu libc .WAIT libarch libatf libbsdmalloc libbluetooth libbz2 \
|
||||
SUBDIR= csu libc .WAIT libarch libatf-c libatf-c++ \
|
||||
libbsdmalloc libbluetooth libbz2 \
|
||||
libcompat libcrypt \
|
||||
libcurses libevent libintl libkvm libl libm \
|
||||
libossaudio libpcap libpci libpmc libposix libprop libpthread \
|
||||
|
||||
@ -1,26 +1,21 @@
|
||||
# $NetBSD: Makefile,v 1.2 2008/02/04 20:32:11 jmmv Exp $
|
||||
# $NetBSD: Makefile,v 1.1 2008/05/01 15:33:33 jmmv Exp $
|
||||
|
||||
NOLINT= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
LIB= atf
|
||||
NOPIC= yes # Interface is still too unstable
|
||||
LIB= atf-c++
|
||||
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
|
||||
NOPIC= # defined; interface is still too unstable
|
||||
|
||||
SRCDIR= ${NETBSDSRCDIR}/dist/atf
|
||||
.PATH: ${SRCDIR}
|
||||
.PATH: ${SRCDIR}/atf
|
||||
.PATH: ${SRCDIR}/atf-c++
|
||||
|
||||
CPPFLAGS+= -I${.CURDIR}
|
||||
CPPFLAGS+= -I${SRCDIR}/libs
|
||||
CPPFLAGS+= -I${.CURDIR}/../libatf-c
|
||||
CPPFLAGS+= -I.
|
||||
|
||||
CPPFLAGS+= -DHAVE_CONFIG_H
|
||||
CPPFLAGS+= -DATF_ARCH=\"${MACHINE}\"
|
||||
CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
|
||||
CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
|
||||
CPPFLAGS+= -DATF_MACHINE=\"${MACHINE_ARCH}\"
|
||||
CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
|
||||
CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
|
||||
CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
|
||||
|
||||
WARNS?= 2
|
||||
|
||||
@ -34,7 +29,6 @@ SRCS= application.cpp \
|
||||
fs.cpp \
|
||||
io.cpp \
|
||||
parser.cpp \
|
||||
sanity.cpp \
|
||||
signals.cpp \
|
||||
tests.cpp \
|
||||
text.cpp \
|
||||
@ -59,10 +53,10 @@ INCS= application.hpp \
|
||||
ui.hpp \
|
||||
user.hpp \
|
||||
utils.hpp
|
||||
INCSDIR= /usr/include/atf
|
||||
INCSDIR= /usr/include/atf-c++
|
||||
|
||||
INCS+= atf.hpp
|
||||
INCSDIR_atf.hpp=/usr/include
|
||||
INCS+= atf-c++.hpp
|
||||
INCSDIR_atf-c++.hpp=/usr/include
|
||||
|
||||
MAN= # empty
|
||||
|
||||
80
lib/libatf-c/Makefile
Normal file
80
lib/libatf-c/Makefile
Normal file
@ -0,0 +1,80 @@
|
||||
# $NetBSD: Makefile,v 1.1 2008/05/01 15:33:33 jmmv Exp $
|
||||
|
||||
NOLINT= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
LIB= atf-c
|
||||
NOPIC= # defined; interface is still too unstable
|
||||
|
||||
SRCDIR= ${NETBSDSRCDIR}/dist/atf
|
||||
.PATH: ${SRCDIR}
|
||||
.PATH: ${SRCDIR}/atf-c
|
||||
|
||||
CPPFLAGS+= -I${.CURDIR}
|
||||
CPPFLAGS+= -I.
|
||||
|
||||
CPPFLAGS+= -DHAVE_CONFIG_H
|
||||
CPPFLAGS+= -DATF_ARCH=\"${MACHINE}\"
|
||||
CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\"
|
||||
CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\"
|
||||
CPPFLAGS+= -DATF_MACHINE=\"${MACHINE_ARCH}\"
|
||||
CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\"
|
||||
CPPFLAGS+= -DATF_SHELL=\"/bin/sh\"
|
||||
CPPFLAGS+= -DATF_WORKDIR=\"/tmp\"
|
||||
|
||||
WARNS?= 2
|
||||
|
||||
SRCS= config.c \
|
||||
dynstr.c \
|
||||
env.c \
|
||||
error.c \
|
||||
expand.c \
|
||||
fs.c \
|
||||
io.c \
|
||||
list.c \
|
||||
map.c \
|
||||
object.c \
|
||||
sanity.c \
|
||||
signals.c \
|
||||
text.c \
|
||||
ui.c \
|
||||
user.c \
|
||||
tc.c \
|
||||
tcr.c \
|
||||
tp.c \
|
||||
tp_main.c
|
||||
|
||||
INCS= config.h \
|
||||
defs.h \
|
||||
dynstr.h \
|
||||
env.h \
|
||||
error.h \
|
||||
expand.h \
|
||||
fs.h \
|
||||
io.h \
|
||||
list.h \
|
||||
macros.h \
|
||||
map.h \
|
||||
object.h \
|
||||
sanity.h \
|
||||
signals.h \
|
||||
tc.h \
|
||||
tcr.h \
|
||||
text.h \
|
||||
tp.h \
|
||||
ui.h \
|
||||
user.h
|
||||
INCSDIR= /usr/include/atf-c
|
||||
|
||||
INCS+= atf-c.h
|
||||
INCSDIR_atf-c.h=/usr/include
|
||||
|
||||
MAN= # empty
|
||||
|
||||
defs.h: defs.h.in
|
||||
sed -e 's,@ATTRIBUTE_NORETURN@,__attribute__((noreturn)),g' \
|
||||
<${SRCDIR}/atf-c/defs.h.in >defs.h.tmp
|
||||
mv defs.h.tmp defs.h
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
@ -1,5 +1,5 @@
|
||||
/* config.h. Generated from config.h.in by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
/* bconfig.h. Generated from bconfig.h.in by configure. */
|
||||
/* bconfig.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if basename takes a constant pointer */
|
||||
/* #undef HAVE_CONST_BASENAME */
|
||||
@ -10,6 +10,9 @@
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
/* Define to 1 if getcwd(NULL, 0) works */
|
||||
#define HAVE_GETCWD_DYN 1
|
||||
|
||||
/* Define to 1 if getopt allows a + sign for POSIX behavior */
|
||||
/* #undef HAVE_GNU_GETOPT */
|
||||
|
||||
@ -67,6 +70,12 @@
|
||||
/* Define to 1 if vsnprintf is in std */
|
||||
/* #undef HAVE_VSNPRINTF_IN_STD */
|
||||
|
||||
/* Define to the last valid signal number */
|
||||
#define LAST_SIGNO 63
|
||||
|
||||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
||||
/* #undef NO_MINUS_C_MINUS_O */
|
||||
|
||||
/* Name of package */
|
||||
#define PACKAGE "atf"
|
||||
|
||||
@ -80,16 +89,16 @@
|
||||
#define PACKAGE_NAME "Automated Testing Framework"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "Automated Testing Framework 0.4"
|
||||
#define PACKAGE_STRING "Automated Testing Framework 0.5"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "atf"
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "0.4"
|
||||
#define PACKAGE_VERSION "0.5"
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.4"
|
||||
#define VERSION "0.5"
|
||||
Loading…
x
Reference in New Issue
Block a user