jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hcrypto: Tidy up some merge conflicts

Browse Source 
There were some (harmless) merge conflicts in the hcrypto Makefile.
Get rid of them.

Change-Id: Iaf67d234d0f9ff24432479b2ae065adb73d5665b
Reviewed-on: http://gerrit.openafs.org/2963
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Simon Wilkinson 2010-10-11 15:18:06 -04:00 committed by Derrick Brashear
parent e279ae77a7
commit 5142f16bd3
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/hcrypto/Makefile.in
View File

@ -283,39 +283,30 @@ err.o: ${UPSTREAM}/roken/err.c
errx.o: ${UPSTREAM}/roken/errx.c
$(AFS_CCRULE) $(UPSTREAM)/roken/errx.c
${CCRULE}
getprogname.o: ${UPSTREAM}/roken/getprogname.c
$(AFS_CCRULE) $(UPSTREAM)/roken/getprogname.c
${CCRULE}
verr.o: ${UPSTREAM}/roken/verr.c
$(AFS_CCRULE) $(UPSTREAM)/roken/verr.c
${CCRULE}
verrx.o: ${UPSTREAM}/roken/verrx.c
$(AFS_CCRULE) $(UPSTREAM)/roken/verrx.c
${CCRULE}
vwarn.o: ${UPSTREAM}/roken/vwarn.c
$(AFS_CCRULE) $(UPSTREAM)/roken/vwarn.c
${CCRULE}
vwarnx.o: ${UPSTREAM}/roken/vwarnx.c
$(AFS_CCRULE) $(UPSTREAM)/roken/vwarnx.c
${CCRULE}
warn.o: ${UPSTREAM}/roken/warn.c
$(AFS_CCRULE) $(UPSTREAM)/roken/warn.c
${CCRULE}
warnerr.o: ${UPSTREAM}/roken/warnerr.c
$(AFS_CCRULE) $(UPSTREAM)/roken/warnerr.c
${CCRULE}
warnx.o: ${UPSTREAM}/roken/warnx.c
$(AFS_CCRULE) $(UPSTREAM)/roken/warnx.c
${CCRULE}
# LWP Targets