rename asn1.h to krb5_asn1.h to avoid conflicts
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9785 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -93,20 +93,20 @@ asn1_print_LDADD = $(check_der_LDADD)
|
|||||||
|
|
||||||
TESTS = check-der
|
TESTS = check-der
|
||||||
|
|
||||||
CLEANFILES = lex.c parse.c parse.h asn1.h $(BUILT_SOURCES) \
|
CLEANFILES = lex.c parse.c parse.h krb5_asn1.h $(BUILT_SOURCES) \
|
||||||
$(gen_files) asn1_files
|
$(gen_files) asn1_files
|
||||||
|
|
||||||
include_HEADERS = asn1.h asn1_err.h der.h
|
include_HEADERS = krb5_asn1.h asn1_err.h der.h
|
||||||
|
|
||||||
$(asn1_compile_OBJECTS): parse.h
|
$(asn1_compile_OBJECTS): parse.h
|
||||||
|
|
||||||
$(gen_files) asn1.h: asn1_files
|
$(gen_files) krb5_asn1.h: asn1_files
|
||||||
|
|
||||||
asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
|
asn1_files: asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
|
||||||
./asn1_compile$(EXEEXT) $(srcdir)/k5.asn1
|
./asn1_compile$(EXEEXT) $(srcdir)/k5.asn1 krb5_asn1
|
||||||
|
|
||||||
$(libasn1_la_OBJECTS): asn1.h asn1_err.h
|
$(libasn1_la_OBJECTS): krb5_asn1.h asn1_err.h
|
||||||
|
|
||||||
$(asn1_print_OBJECTS): asn1.h
|
$(asn1_print_OBJECTS): krb5_asn1.h
|
||||||
|
|
||||||
EXTRA_DIST = asn1_err.et
|
EXTRA_DIST = asn1_err.et
|
||||||
|
@@ -43,7 +43,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "asn1.h"
|
#include "krb5_asn1.h"
|
||||||
#include "der.h"
|
#include "der.h"
|
||||||
#include "asn1_err.h"
|
#include "asn1_err.h"
|
||||||
#include <parse_units.h>
|
#include <parse_units.h>
|
||||||
|
Reference in New Issue
Block a user