more srcdir fixes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3802 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 769f58041484949c69b379694318d91daeaa84d5..d64446427e2386a2b3e4464fd38e561c8ee2cac5 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -6,7 +6,7 @@ VPATH = @srcdir@
 DEFS = @DEFS@
 LIBS = @LIBS@
  
-CFLAGS = -g $(DEFS)
+CFLAGS = -g $(DEFS) -I. -I$(srcdir)
 LDFLAGS = -g
 
 RM = rm -f
@@ -23,6 +23,12 @@ ETSRCS= gssapi_generic_err.c
 ETOBJS= gssapi_generic_err.o
 ETHDRS= gssapi_generic_err.h
 
+gssapi_generic_err.o: gssapi_generic_err.c
+
+gssapi_generic_err.h: gssapi_generic_err.et
+
+gssapi_generic_err.c: gssapi_generic_err.et
+
 #if HasHashLibrary
 # UTIL_VALIDATE_SRC= $(srcdir)/util_validate.c
 # UTIL_VALIDATE_OBJ= util_validate.o

diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index 402a6fc6a46c7307101e47b2011c9072f27164d6..fe09467ca7b4473aa24a89379cf3eb2aa34bee43 100644 (file)
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -3,6 +3,6 @@ ET_RULES
 CONFIG_RULES
 SubdirLibraryRule([${OBJS}])
 KRB_INCLUDE
-CopyHeader(gssapi.h,[$(EHDRDIR)])
-CopyHeader(gssapi_generic.h,[$(EHDRDIR)])
+CopySrcHeader(gssapi.h,[$(EHDRDIR)])
+CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
 AC_OUTPUT(Makefile,[EXTRA_RULES])

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index b0bc84a4491e90494f64a5dc54e0fdf5799515a0..b748bab7567efb3b9f979fc29b5b0a6eded0916f 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -6,7 +6,7 @@ VPATH = @srcdir@
 DEFS = @DEFS@
 LIBS = @LIBS@
  
-CFLAGS = -g $(DEFS)
+CFLAGS = -g $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 LDFLAGS = -g
 
 RM = rm -f
@@ -23,6 +23,12 @@ ETSRCS= gssapi_krb5_err.c
 ETOBJS= gssapi_krb5_err.o
 ETHDRS= gssapi_krb5_err.h
 
+gssapi_krb5_err.o: gssapi_krb5_err.c
+
+gssapi_krb5_err.h: gssapi_krb5_err.et
+
+gssapi_krb5_err.c: gssapi_krb5_err.et
+
 CCSRCS = \
        $(srcdir)/accept_sec_context.c \
        $(srcdir)/acquire_cred.c \

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 97d3288aab8b62e0f91ba0bb71404041bbd56fcd..0d3057a281fc67cfff4ea917121aa64864b26ee8 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -21,7 +21,7 @@ LINTFLAGS=-uhvb
 LINTFILES= error_message.c et_name.c init_et.c com_err.c
 LIBOBJS= error_message.o et_name.o init_et.o com_err.o
 # for et_lex.lex.c include in error_table.y
-LOCALINCLUDE=-I. 
+LOCALINCLUDE=-I. -I$(srcdir)
 
 FILES= Makefile et_name.c error_message.c compile_et.c \
                et_lex.lex.l error_table.y init_et.c \

diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index c739fdae1514ed678f39eefd3af4b001585c6dee..99a1cdd346bcda385bc82091dda0adfd9d765ef2 100644 (file)
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -30,7 +30,7 @@ TOP=$(BUILDTOP)
 # hard coded .. is so that ss/ss_err.h works
 # hard coded ../et is so com_err.h works
 # CFLAGS= -I${INCDIR} -I. -I.. -I../et -g
-LOCALINCLUDE= -I. -I$(srcdir)/.. -I$(srcdir)/../et -I..
+LOCALINCLUDE= -I. -I$(srcdir)/ -I$(srcdir)/.. -I$(srcdir)/../et -I..
 
 # for the library