bnicholes 2003/11/16 18:38:04
Modified: . NWGNUmakefile
build nw_export.inc
Log:
Pull apr_random from the NetWare build
Revision Changes Path
1.19 +3 -6 apr/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/apr/NWGNUmakefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- NWGNUmakefile 11 Nov 2003 22:03:52 -0000 1.18
+++ NWGNUmakefile 17 Nov 2003 02:38:04 -0000 1.19
@@ -278,11 +278,8 @@
$(OBJDIR)/proc_mutex.o \
$(OBJDIR)/rand.o \
$(OBJDIR)/readwrite.o \
- $(OBJDIR)/apr_random.o \
$(OBJDIR)/seek.o \
$(OBJDIR)/sendrecv.o \
- $(OBJDIR)/sha2.o \
- $(OBJDIR)/sha2_glue.o \
$(OBJDIR)/shm.o \
$(OBJDIR)/signals.o \
$(OBJDIR)/sockaddr.o \
@@ -406,9 +403,9 @@
@echo Compiling $<
$(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
-$(OBJDIR)/%.o: random/unix/%.c $(OBJDIR)\cc.opt
- @echo Compiling $<
- $(CC) random\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+#$(OBJDIR)/%.o: random/unix/%.c $(OBJDIR)\cc.opt
+# @echo Compiling $<
+# $(CC) random\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
#
# Include the 'tail' makefile that has targets that depend on variables
defined
1.16 +1 -1 apr/build/nw_export.inc
Index: nw_export.inc
===================================================================
RCS file: /home/cvs/apr/build/nw_export.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nw_export.inc 11 Nov 2003 22:03:52 -0000 1.15
+++ nw_export.inc 17 Nov 2003 02:38:04 -0000 1.16
@@ -31,7 +31,7 @@
#include "apr_portable.h"
#include "apr_proc_mutex.h"
#include "apr_ring.h"
-#include "apr_random.h"
+/*#include "apr_random.h"*/
#include "apr_shm.h"
#include "apr_signal.h"
#include "apr_strings.h"
