oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename some headers to avoid conflict with possible system headers

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9329 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-12-10 19:12:52 +00:00
parent e189571626
commit 1ce658d4f3
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/roken/Makefile.am
View File

@@ -7,7 +7,7 @@ AM_CFLAGS += $(WFLAGS)
## ACLOCAL = @ACLOCAL@ -I cf ## ACLOCAL = @ACLOCAL@ -I cf
ACLOCAL_AMFLAGS = -I ../../cf ACLOCAL_AMFLAGS = -I ../../cf
CLEANFILES = roken.h make-roken.c CLEANFILES = roken.h make-roken.c $(XHEADERS)
lib_LTLIBRARIES = libroken.la lib_LTLIBRARIES = libroken.la
libroken_la_LDFLAGS = -version-info 10:0:1 libroken_la_LDFLAGS = -version-info 10:0:1
@@ -80,12 +80,12 @@ EXTRA_libroken_la_SOURCES = \
copyhostent.c \ copyhostent.c \
daemon.c \ daemon.c \
err.c \ err.c \
err.h \ err.hin \
errx.c \ errx.c \
fchown.c \ fchown.c \
flock.c \ flock.c \
fnmatch.c \ fnmatch.c \
fnmatch.h \ fnmatch.hin \
freeaddrinfo.c \ freeaddrinfo.c \
freehostent.c \ freehostent.c \
gai_strerror.c \ gai_strerror.c \
@@ -102,7 +102,7 @@ EXTRA_libroken_la_SOURCES = \
gettimeofday.c \ gettimeofday.c \
getuid.c \ getuid.c \
getusershell.c \ getusershell.c \
glob.h \ glob.hin \
hstrerror.c \ hstrerror.c \
ifaddrs.h \ ifaddrs.h \
inet_aton.c \ inet_aton.c \
@@ -152,16 +152,10 @@ EXTRA_DIST = roken.awk roken.h.in
libroken_la_LIBADD = @LTLIBOBJS@ libroken_la_LIBADD = @LTLIBOBJS@
$(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(LTLIBOBJS) $(libroken_la_OBJECTS): $(include_HEADERS) roken.h
BUILT_SOURCES = make-roken.c roken.h BUILT_SOURCES = make-roken.c roken.h
include_HEADERS = $(err_h) base64.h getarg.h \
parse_bytes.h parse_time.h parse_units.h \
resolve.h roken-common.h \
$(err_h) $(fnmatch_h) $(glob_h) $(vis_h) rtbl.h xdbm.h
nodist_include_HEADERS = roken.h
if have_err_h if have_err_h
err_h = err_h =
else else
@@ -180,12 +174,40 @@ else
glob_h = glob.h glob_h = glob.h
endif endif
if have_ifaddrs_h
ifaddrs_h =
else
ifaddrs_h = ifaddrs.h
endif
if have_vis_h if have_vis_h
vis_h = vis_h =
else else
vis_h = vis_h vis_h = vis.h
endif endif
## these are controlled by configure
XHEADERS = $(err_h) $(fnmatch_h) $(glob_h) $(ifaddrs_h) $(vis_h)
include_HEADERS = \
base64.h \
getarg.h \
parse_bytes.h \
parse_time.h \
parse_units.h \
resolve.h \
roken-common.h \
rtbl.h \
xdbm.h \
$(XHEADERS)
nodist_include_HEADERS = roken.h
SUFFIXES += .hin
.hin.h:
cp $< $@
roken.h: make-roken$(EXEEXT) roken.h: make-roken$(EXEEXT)
@./make-roken$(EXEEXT) > tmp.h ;\ @./make-roken$(EXEEXT) > tmp.h ;\
if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \