From: danw <danw>
Date: Wed, 27 May 1998 17:33:00 +0000 (+0000)
Subject: updates for server-side VPATH compiling
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/f4036eedf4098dbec949bdf66ef46d21d1a23e46

updates for server-side VPATH compiling
---

diff --git a/afssync/Makefile.in b/afssync/Makefile.in
index d97ad5a8..edbc229c 100644
--- 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 6741a3fd..31c01bb3 100644
--- 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 410d8d80..cf840006 100755
--- 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 768b713b..0ff16c09 100644
--- 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 325e16ac..2d631b9e 100644
--- 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 40bcd500..c9beaea9 100644
--- 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 ce7632cd..3313a0c3 100644
--- 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 aff38c0a..d7084629 100644
--- 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) $@