Support separate source and binary directories

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

diff --git a/src/lib/kdb/Imakefile b/src/lib/kdb/Imakefile
index 7fbd82c95bb5a0b3a3c9c8b0c47abaa730d7b675..08ca8082cbbb810facacd657dd90529f6bb1c515 100644 (file)
--- a/src/lib/kdb/Imakefile
+++ b/src/lib/kdb/Imakefile
@@ -23,13 +23,13 @@
 # 
 # 
 SRCS= \
-       encrypt_key.c \
-       decrypt_key.c \
-       kdb_dbm.c \
-       verify_mky.c \
-       fetch_mkey.c \
-       setup_mkey.c \
-       store_mkey.c
+       $(SRCDIR)encrypt_key.c \
+       $(SRCDIR)decrypt_key.c \
+       $(SRCDIR)kdb_dbm.c \
+       $(SRCDIR)verify_mky.c \
+       $(SRCDIR)fetch_mkey.c \
+       $(SRCDIR)setup_mkey.c \
+       $(SRCDIR)store_mkey.c
 
 NormalLibraryObjectRule()
 

diff --git a/src/lib/krb5/os/Imakefile b/src/lib/krb5/os/Imakefile
index 7c3c89507a80f461712c970a64656e3a81793b71..554631526d0f58cd346c3e1503469de6a09db60f 100644 (file)
--- a/src/lib/krb5/os/Imakefile
+++ b/src/lib/krb5/os/Imakefile
@@ -24,7 +24,7 @@
 # 
 NormalLibraryObjectRule()
 
-OBJS= \
+KRBOBJS= \
        an_to_ln.o      \
        def_realm.o     \
        ccdefname.o     \
@@ -35,6 +35,7 @@ OBJS= \
        gen_port.o      \
        gen_rname.o     \
        hst_realm.o     \
+       krbfileio.o     \
        ktdefname.o     \
        kuserok.o       \
        localaddr.o     \
@@ -44,7 +45,6 @@ OBJS= \
        net_write.o     \
        osconfig.o      \
        port2ip.o       \
-       rnd_confoun.o   \
        read_msg.o      \
        read_pwd.o      \
        sendto_kdc.o    \
@@ -54,39 +54,45 @@ OBJS= \
        ustime.o        \
        write_msg.o
 
+DESOBJS= \
+       rnd_confoun.o
+
+OBJS = $(KRBOBJS) $(DESOBJS)
+
 
 SRCS= \
-       an_to_ln.c      \
-       def_realm.c     \
-       ccdefname.c     \
-       free_krbhs.c    \
-       free_hstrl.c    \
-       full_ipadr.c    \
-       get_krbhst.c    \
-       gen_port.c      \
-       gen_rname.c     \
-       hst_realm.c     \
-       ktdefname.c     \
-       kuserok.c       \
-       localaddr.c     \
-       locate_kdc.c    \
-       lock_file.c     \
-       net_read.c      \
-       net_write.c     \
-       osconfig.c      \
-       read_msg.c      \
-       read_pwd.c      \
-       port2ip.c       \
-       rnd_confoun.c   \
-       sendto_kdc.c    \
-       sn2princ.c      \
-       timeofday.c     \
-       unlck_file.c    \
-       ustime.c        \
-       write_msg.c
+       $(SRCDIR)an_to_ln.c     \
+       $(SRCDIR)def_realm.c    \
+       $(SRCDIR)ccdefname.c    \
+       $(SRCDIR)free_krbhs.c   \
+       $(SRCDIR)free_hstrl.c   \
+       $(SRCDIR)full_ipadr.c   \
+       $(SRCDIR)get_krbhst.c   \
+       $(SRCDIR)gen_port.c     \
+       $(SRCDIR)gen_rname.c    \
+       $(SRCDIR)hst_realm.c    \
+       $(SRCDIR)krbfileio.c    \
+       $(SRCDIR)ktdefname.c    \
+       $(SRCDIR)kuserok.c      \
+       $(SRCDIR)localaddr.c    \
+       $(SRCDIR)locate_kdc.c   \
+       $(SRCDIR)lock_file.c    \
+       $(SRCDIR)net_read.c     \
+       $(SRCDIR)net_write.c    \
+       $(SRCDIR)osconfig.c     \
+       $(SRCDIR)read_msg.c     \
+       $(SRCDIR)read_pwd.c     \
+       $(SRCDIR)port2ip.c      \
+       $(SRCDIR)rnd_confoun.c  \
+       $(SRCDIR)sendto_kdc.c   \
+       $(SRCDIR)sn2princ.c     \
+       $(SRCDIR)timeofday.c    \
+       $(SRCDIR)unlck_file.c   \
+       $(SRCDIR)ustime.c       \
+       $(SRCDIR)write_msg.c
 
-Krb5LibraryTarget(os,${OBJS})
+OtherdirLibraryTarget(..,$(DESLIB),localaddr.o ustime.o $(DESOBJS))
 
-OtherdirLibraryTarget(..,des5,localaddr.o ustime.o rnd_confoun.o)
+OtherdirLibraryTarget(..,krb5,$(KRBOBJS))
 
-OtherdirLibraryTarget(..,krb5,$(OBJS))
+DependTarget()