hcrypto: Tidy up some merge conflicts

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>

diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in
index 5029000b1564e84aac5ead6372335277317f223a..88ab92740db704871999c091ce23d6abb43ff4f1 100644 (file)
--- a/src/crypto/hcrypto/Makefile.in
+++ b/src/crypto/hcrypto/Makefile.in
@@ -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