updates for server-side VPATH compiling

diff --git a/afssync/Makefile.in b/afssync/Makefile.in
index d97ad5a8f789de9fcb8eba143f91be39aa1f0ec1..edbc229cf543f75e50d257eafafe715e7a9a6d34 100644 (file)
--- a/afssync/Makefile.in
+++ b/afssync/Makefile.in
@@ -40,7 +40,7 @@ TARGET=afssync pt_util
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/backup/Makefile.in b/backup/Makefile.in
index 6741a3fdb20480b1f7e02c94e4cdbeb301dae24f..31c01bb32ad328d793a634d6262057ff8795c9cd 100644 (file)
--- a/backup/Makefile.in
+++ b/backup/Makefile.in
@@ -35,7 +35,7 @@ TARGET=mrbackup mrrestore
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/configure.in b/configure.in
index 410d8d8084dd16fbc78a40e88cf127bfd535e06f..cf8400061ab635b5fe492e7a52655d1358eb6284 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -319,6 +319,7 @@ MR_INCLUDE('$(SRCTOP)/include')
 MR_INCLUDE('$(SRCTOP)/lib')
 MR_INCLUDE('$(BUILDTOP)/lib')
 MR_INCLUDE('$(BUILDTOP)/db')
+MR_INCLUDE('$(srcdir)')
 LDFLAGS="$LDFLAGS -L\$(BUILDTOP)/lib $LIBPATH"
 KLIBS="-lzephyr $KRB4_LIBS -lcom_err -lhesiod $LIBS"
 LIBS="-lmoira $KLIBS"

diff --git a/dbck/Makefile.in b/dbck/Makefile.in
index 768b713b66271d1d3586181bab3b086547fec9c3..0ff16c092f74296dd0b6d8b9d798aa5aaa62f871 100644 (file)
--- a/dbck/Makefile.in
+++ b/dbck/Makefile.in
@@ -33,7 +33,7 @@ TARGET=dbck
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/dcm/Makefile.in b/dcm/Makefile.in
index 325e16ac567b5eed5b82fd104ed708d5d7e50db4..2d631b9e98d73a5086153ee83f1f40237625099e 100644 (file)
--- a/dcm/Makefile.in
+++ b/dcm/Makefile.in
@@ -37,7 +37,7 @@ TARGET=dcm startdcm
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/gen/Makefile.in b/gen/Makefile.in
index 40bcd500008f89eb48b4c863b1830820dca9e82e..c9beaea9733d1c45e6d4e0269a434515c2a895e1 100644 (file)
--- a/gen/Makefile.in
+++ b/gen/Makefile.in
@@ -39,7 +39,7 @@ TARGET=       hesiod.gen nfs.gen mailhub.gen pobox.gen hosts.gen \
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/regtape/Makefile.in b/regtape/Makefile.in
index ce7632cdba1753513a1e4b6ad9bc30ba376523b6..3313a0c3f9ff332046ad7c0455fde79fca8111ef 100644 (file)
--- a/regtape/Makefile.in
+++ b/regtape/Makefile.in
@@ -40,7 +40,7 @@ TARGET=students employee vote sign verify
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<

diff --git a/server/Makefile.in b/server/Makefile.in
index aff38c0a74775f3ce5ffd50ef10863e7370041ae..d708462952df49d23bca4d5916f5d8dcca9aec10 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -30,20 +30,17 @@ SERVER_OBJS=        mr_main.o mr_sauth.o mr_scall.o mr_shutdown.o mr_util.o \
                qvalidate.o qaccess.o qsetup.o qsupport.o qfollow.o \
                queries2.o qrtn.o qsubs.o increment.o cache.o
 SCHEMA_OBJS=   ../db/moira_schema.o
-GLUE_OBJS=     mr_glue.o mr_sauth.o mr_util.o \
-               qvalidate.o qaccess.o qsetup.o qsupport.o qfollow.o \
-               queries2.o qrtn.o qsubs.o increment.o cache.o
 START_OBJS=    startmoira.o
 
 CFILES=                qvalidate.c qaccess.c qsetup.c qsupport.c qfollow.c \
                qrtn.c increment.c cache.c
 
-TARGET=moirad startmoira libmrglue.a
+TARGET=moirad startmoira
 
 .SUFFIXES: .pc
 
 .pc.c:
-       $(PRO_C) $(PRO_C_FLAGS) INAME=$<
+       $(PRO_C) $(PRO_C_FLAGS) INAME=$< ONAME=$@
 
 .c.o:
        $(CC) -c $(ALL_CFLAGS) $<
@@ -51,7 +48,7 @@ TARGET=moirad startmoira libmrglue.a
 all: $(TARGET)
 
 clean:
-       rm -f $(SERVER_OBJS) $(GLUE_OBJS) $(START_OBJS) $(CFILES) $(TARGET)
+       rm -f $(SERVER_OBJS) $(START_OBJS) $(CFILES) $(TARGET)
 
 depend: $(CFILES)
 
@@ -64,7 +61,3 @@ moirad: $(SERVER_OBJS)
 
 startmoira: $(START_OBJS)
        $(CC) -o $@ $(LDFLAGS) $(START_OBJS) $(LIBS)
-
-libmrglue.a: $(GLUE_OBJS)
-       ar cru $@ $(GLUE_OBJS) $(SCHEMA_OBJS)
-       $(RANLIB) $@