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

roken: Fix Makefile race

Browse Source
This commit is contained in:
Nicolas Williams
2021-04-26 14:39:53 -05:00
parent 1e65ebd5eb
commit 034413892e
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
lib/roken/Makefile.am
View File

@@ -59,7 +59,37 @@ test_auxval_SOURCES = test-auxval.c
test_getuserinfo_SOURCES = test-getuserinfo.c test_getuserinfo_SOURCES = test-getuserinfo.c
test_getuserinfo_LDADD = libtest.la $(LDADD) test_getuserinfo_LDADD = libtest.la $(LDADD)
rkvis_SOURCES = vis.c if have_err_h
err_h =
else
err_h = err.h
endif
if have_fnmatch_h
fnmatch_h =
else
fnmatch_h = fnmatch.h
endif
if have_ifaddrs_h
ifaddrs_h =
else
ifaddrs_h = ifaddrs.h
endif
if have_search_h
search_h =
else
search_h = search.h
endif
if have_vis_h
vis_h =
else
vis_h = vis.h
endif
rkvis_SOURCES = vis.c $(vis_h)
rkvis_CPPFLAGS = -DTEST rkvis_CPPFLAGS = -DTEST
rkbase32_SOURCES = base32.c rkbase32_SOURCES = base32.c
@@ -148,6 +178,7 @@ libroken_la_SOURCES = \
tm2time.c \ tm2time.c \
unvis.c \ unvis.c \
vis.c \ vis.c \
$(vis_h) \
warnerr.c \ warnerr.c \
write_pid.c \ write_pid.c \
xfree.c \ xfree.c \
@@ -164,37 +195,7 @@ libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) $(LIB_pidfile)
$(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS) $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
BUILT_SOURCES = roken.h BUILT_SOURCES = roken.h $(err_h) $(fnmatch_h) $(ifadds_h) $(search_h) $(vin_h)
if have_err_h
err_h =
else
err_h = err.h
endif
if have_fnmatch_h
fnmatch_h =
else
fnmatch_h = fnmatch.h
endif
if have_ifaddrs_h
ifaddrs_h =
else
ifaddrs_h = ifaddrs.h
endif
if have_search_h
search_h =
else
search_h = search.h
endif
if have_vis_h
vis_h =
else
vis_h = vis.h
endif
## these are controlled by configure ## these are controlled by configure
XHEADERS = $(err_h) $(fnmatch_h) $(ifaddrs_h) $(search_h) $(vis_h) XHEADERS = $(err_h) $(fnmatch_h) $(ifaddrs_h) $(search_h) $(vis_h)