d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use in-tree libbsdxml instead of ports based libexpat.

Browse Source 
Sponsored by:	DARPA & NAI Labs.
This commit is contained in:
Poul-Henning Kamp 2002-10-05 13:16:07 +00:00
parent af65c5b73f
commit 5624b2d4d3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=104512
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/regression/geom/ConfCmp/ConfCmp.c
View File

@ -46,7 +46,7 @@
#include <sys/queue.h>
#include <sys/sbuf.h>
#include <err.h>
#include "expat.h"
#include <bsdxml.h>
struct node {
LIST_HEAD(, node) children;

8
tools/regression/geom/ConfCmp/Makefile
View File

@ -3,16 +3,16 @@
PROG= ConfCmp
SRCS+= ConfCmp.c
SRCS+= subr_sbuf.c
VPATH+= /sys/kern
.PATH: ../../../../sys/kern
NOOBJ= youbet
WARNS= 5
CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static
# Uncomment for ElectricFence
#LDADD += -lefence -L/usr/local/lib
# Stuff for XML
LDADD += -L/usr/local/lib -lexpat
CFLAGS += -I/usr/local/include/xml
LDADD += -lbsdxml
NOMAN= yeah
CLEANFILES += _*

7
tools/regression/geom/GLib/Makefile
View File

@ -2,7 +2,7 @@
LIB= G
SRCS= geom.c geom_aes.c geom_bsd.c geom_simdev.c geom_dump.c \
geom_event.c geom_gpt.c \
geom_event.c \
geom_io.c \
geom_kernsim.c geom_mbr.c geom_simdisk.c geom_enc.c \
geom_simdisk_xml.c geom_slice.c geom_subr.c subr_sbuf.c \
@ -11,15 +11,14 @@ SRCS= geom.c geom_aes.c geom_bsd.c geom_simdev.c geom_dump.c \
CFLAGS += -g -static -W -Wall
CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
CFLAGS += -I/usr/local/include/xml -I/usr/src/sys -I..
CFLAGS += -I/usr/src/sys -I..
CFLAGS += -DKERNELSIM
NOPIC = static
NOPROFILE = bingo
NOOBJ = youbet
WARNS = 2
LDADD +=r -L/usr/local/lib -lexpat
VPATH+= /sys/geom:..:/sys/kern
.PATH: /sys/geom .. /sys/kern
.include <bsd.lib.mk>

4
tools/regression/geom/Test/Makefile.inc
View File

@ -6,8 +6,8 @@ NOOBJ = youbet
CFLAGS += -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -Wpointer-arith -static -I/usr/src/sys -I../..
CFLAGS += -DKERNELSIM -pthread
LDADD += -L../../GLib -lG
LDADD += -L/usr/local/lib -lexpat
LDADD += -L../../GLib -lG
LDADD += -lbsdxml
DPADD += ../../GLib/libG.a
CLEANFILES += _* *.core
WARNS= 2

1
tools/regression/geom/Test/T014/Makefile
View File

@ -1,3 +1,2 @@
# $FreeBSD$
.include "../Makefile.inc"
.include <bsd.prog.mk>

2
tools/regression/geom/geom_simdisk_xml.c
View File

@ -46,7 +46,7 @@
#include <geom/geom.h>
#include <string.h>
#include <ctype.h>
#include "expat.h"
#include <bsdxml.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <sys/queue.h>