From b59d5b02af24bb94df260ac7dc4f8c0e909b02cd Mon Sep 17 00:00:00 2001
From: Michael Gary <muon1183@yahoo.com>
Date: Sun, 9 Jun 2002 02:38:24 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=105
---
 sched/Makefile.nofcgi.in                      | 68 -------------------
 .../Makefile.in                               | 32 ++++++---
 2 files changed, 21 insertions(+), 79 deletions(-)
 delete mode 100644 sched/Makefile.nofcgi.in
 rename sched/Makefile.fcgi.in => sched_fcgi/Makefile.in (67%)

diff --git a/sched/Makefile.nofcgi.in b/sched/Makefile.nofcgi.in
deleted file mode 100644
index e244966271..0000000000
--- a/sched/Makefile.nofcgi.in
+++ /dev/null
@@ -1,68 +0,0 @@
-DEPTH   = ..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-all: cgi
-
-CFLAGS = -g -Wall @DEFS@ -I@top_srcdir@/db -I@top_srcdir@/lib -I@top_srcdir@/tools
-CC = g++ $(CFLAGS)
-
-CLIBS = @LIBS@
-
-PROGS = cgi feeder show_shmem
-
-all: $(PROGS)
-
-CGI_OBJS = \
-    handle_request.o \
-    main.o \
-    sched_shmem.o \
-    server_types.o \
-    ../db/db_mysql.o \
-    ../db/mysql_util.o \
-    ../lib/shmem.o \
-    ../lib/parse.o \
-    ../tools/process_result_template.o
-
-FEEDER_OBJS = \
-    feeder.o \
-    sched_shmem.o \
-    ../db/db_mysql.o \
-    ../db/mysql_util.o \
-    ../lib/shmem.o
-
-SHOW_SHMEM_OBJS = \
-    show_shmem.o \
-    sched_shmem.o \
-    ../db/db_mysql.o \
-    ../db/mysql_util.o \
-    ../lib/shmem.o
-
-MYSQL_DIR = /usr/local/mysql/lib
-MYSQL_LIBS = \
--L$(MYSQL_DIR) -L/sw/lib/mysql -L/usr/local/lib/mysql \
--lmysqlclient -L/usr/local/lib -lz \
--lm $(NETLIBS) 
-
-.C.o:
-	$(CC) -c -o $*.o $<
-.c.o:
-	$(CC) -c -o $*.o $<
-
-cgi: $(CGI_OBJS)
-	$(CC) $(CGI_OBJS) $(MYSQL_LIBS) $(CLIBS) -o cgi
-
-feeder: $(FEEDER_OBJS)
-	$(CC) $(FEEDER_OBJS) $(MYSQL_LIBS) $(CLIBS) -o feeder
-
-show_shmem: $(SHOW_SHMEM_OBJS)
-	$(CC) $(SHOW_SHMEM_OBJS) $(MYSQL_LIBS) $(CLIBS) -o show_shmem
-
-dependencies: @srcdir@/*.C
-	$(CC) -M @srcdir@/*.C > dependencies
-
-include dependencies
-
-clean:
-	rm -f $(PROGS) *.o core dependencies config.cache
diff --git a/sched/Makefile.fcgi.in b/sched_fcgi/Makefile.in
similarity index 67%
rename from sched/Makefile.fcgi.in
rename to sched_fcgi/Makefile.in
index 12a64cf405..e6a8df2225 100644
--- a/sched/Makefile.fcgi.in
+++ b/sched_fcgi/Makefile.in
@@ -15,26 +15,26 @@ PROGS = cgi feeder show_shmem
 all: $(PROGS)
 
 CGI_OBJS = \
-    handle_request.o \
-    main.o \
-    sched_shmem.o \
-    server_types.o \
+    ../sched/handle_request.o \
+    ../sched/main.o \
+    ../sched/sched_shmem.o \
+    ../sched/server_types.o \
     ../db/db_mysql.o \
     ../db/mysql_util.o \
     ../lib/shmem.o \
-    parse.o \
+    ../parse.o \
     ../tools/process_result_template.o
 
 FEEDER_OBJS = \
-    feeder.o \
-    sched_shmem.o \
+    ../sched/feeder.o \
+    ../sched/sched_shmem.o \
     ../db/db_mysql.o \
     ../db/mysql_util.o \
     ../lib/shmem.o
 
 SHOW_SHMEM_OBJS = \
-    show_shmem.o \
-    sched_shmem.o \
+    ../sched/show_shmem.o \
+    ../sched/sched_shmem.o \
     ../db/db_mysql.o \
     ../db/mysql_util.o \
     ../lib/shmem.o
@@ -47,13 +47,17 @@ MYSQL_LIBS = \
 
 .C.o:
 	rm -f ../lib/parse.o
+	rm -f ../sched/feeder.o \
+	      ../sched/main.o \
+	      ../sched/server_types.o \
+	      ../sched/sched_shmem.o \
+	      ../sched/show_shmem.o
 	$(CC) -c -o $*.o $<
 .c.o:
 	$(CC) -c -o $*.o $<
 
 cgi: $(CGI_OBJS)
-	$(CC) $(CGI_OBJS) $(MYSQL_LIBS) $(CLIBS) -o cgi
-	rm -f ../lib/parse.o
+	$(CC) $(CGI_OBJS) $(MYSQL_LIBS) $(CLIBS) -o fcgi
 
 feeder: $(FEEDER_OBJS)
 	$(CC) $(FEEDER_OBJS) $(MYSQL_LIBS) $(CLIBS) -o feeder
@@ -68,3 +72,9 @@ include dependencies
 
 clean:
 	rm -f $(PROGS) *.o core dependencies config.cache
+	rm -f ../sched/feeder.o \
+	      ../sched/main.o \
+	      ../sched/server_types.o \
+	      ../sched/sched_shmem.o \
+	      ../sched/show_shmem.o
+	rm -f ../lib/parse.o