summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>1999-06-03 22:35:44 +0000
committerwtc%netscape.com <devnull@localhost>1999-06-03 22:35:44 +0000
commit49fb15885c9afef76ff42fb26e1232a0e840a49e (patch)
tree959772b94f2211a2f253c0723ebfa6d27aede321
parent5ce3c85f189a99d65f8c265b8970a68af9dfd3b8 (diff)
downloadnspr-hg-49fb15885c9afef76ff42fb26e1232a0e840a49e.tar.gz
Bugzilla bug #4842: do not export private NSPR headers (private/pprmwait.h,
private/primpl.h, and md/*.h) to mozilla/dist. NSPR files will get these headers from the source tree, via -I$(MOD_DEPTH)/pr/include and -I$(MOD_DEPTH)/pr/include/private. Non-NSPR files must not include these private NSPR headers and should get the exported NSPR headers from mozilla/dist/<platform.OBJ>/include.
Diffstat
-rw-r--r--lib/ds/Makefile2
-rw-r--r--lib/prstreams/Makefile2
-rw-r--r--pr/include/Makefile6
-rw-r--r--pr/include/md/Makefile4
-rw-r--r--pr/include/obsolete/Makefile6
-rw-r--r--pr/include/private/Makefile6
-rw-r--r--pr/src/bthreads/Makefile2
-rw-r--r--pr/src/cplus/Makefile2
-rw-r--r--pr/src/io/Makefile2
-rw-r--r--pr/src/linking/Makefile2
-rw-r--r--pr/src/malloc/Makefile2
-rw-r--r--pr/src/md/Makefile2
-rw-r--r--pr/src/md/beos/Makefile2
-rw-r--r--pr/src/md/os2/Makefile2
-rw-r--r--pr/src/md/unix/Makefile2
-rw-r--r--pr/src/md/windows/Makefile2
-rw-r--r--pr/src/memory/Makefile2
-rw-r--r--pr/src/misc/Makefile2
-rw-r--r--pr/src/pthreads/Makefile2
-rw-r--r--pr/src/threads/Makefile2
-rw-r--r--pr/src/threads/combined/Makefile2
-rw-r--r--pr/tests/Makefile2
-rw-r--r--pr/tests/selct_nm.c4
-rw-r--r--pr/tests/selct_to.c4
-rw-r--r--pr/tests/w16gui/Makefile3
-rw-r--r--tools/Makefile4
26 files changed, 39 insertions, 34 deletions
diff --git a/lib/ds/Makefile b/lib/ds/Makefile
index 3c3407dd..3e166b08 100644
--- a/lib/ds/Makefile
+++ b/lib/ds/Makefile
@@ -28,7 +28,7 @@ OPTIMIZER =
endif
endif
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
CSRCS = \
plarena.c \
diff --git a/lib/prstreams/Makefile b/lib/prstreams/Makefile
index d844623b..eda13161 100644
--- a/lib/prstreams/Makefile
+++ b/lib/prstreams/Makefile
@@ -41,7 +41,7 @@ ifeq ($(OS_ARCH),HP-UX)
endif
endif
-INCLUDES = -I$(DIST)/include -I../../../include
+INCLUDES = -I$(DIST)/include
HEADERS = *.h
diff --git a/pr/include/Makefile b/pr/include/Makefile
index 27305db3..92fd718a 100644
--- a/pr/include/Makefile
+++ b/pr/include/Makefile
@@ -30,8 +30,8 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
include $(MOD_DEPTH)/config/rules.mk
-export:: $(HEADERS)
- $(INSTALL) -m 444 $(HEADERS) $(DIST)/include
+export:: $(RELEASE_HEADERS)
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include
ifeq ($(MOZ_BITS),16)
- $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)
endif
diff --git a/pr/include/md/Makefile b/pr/include/md/Makefile
index 684ceaa0..18577166 100644
--- a/pr/include/md/Makefile
+++ b/pr/include/md/Makefile
@@ -143,12 +143,10 @@ ifeq ($(OS_ARCH),BeOS)
MDCPUCFG_H = _beos.cfg
endif
-export:: $(HEADERS) $(MDCPUCFG_H)
- $(INSTALL) -m 444 $(HEADERS) $(DIST)/include/md
+export:: $(MDCPUCFG_H)
$(INSTALL) -m 444 $(MDCPUCFG_H) $(DIST)/include
ifeq ($(MOZ_BITS),16)
cp $(DIST)/include/$(MDCPUCFG_H) $(DIST)/include/prcpucfg.h
- $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)/md
$(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL)
mv -f $(DIST)/include/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
else
diff --git a/pr/include/obsolete/Makefile b/pr/include/obsolete/Makefile
index bf3aa375..2aba1bae 100644
--- a/pr/include/obsolete/Makefile
+++ b/pr/include/obsolete/Makefile
@@ -28,8 +28,8 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
include $(MOD_DEPTH)/config/rules.mk
-export:: $(HEADERS)
- $(INSTALL) -m 444 $(HEADERS) $(DIST)/include/obsolete
+export:: $(RELEASE_HEADERS)
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/obsolete
ifeq ($(MOZ_BITS),16)
- $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)/obsolete
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/obsolete
endif
diff --git a/pr/include/private/Makefile b/pr/include/private/Makefile
index b866730d..25c6909a 100644
--- a/pr/include/private/Makefile
+++ b/pr/include/private/Makefile
@@ -28,8 +28,8 @@ HEADERS = $(RELEASE_HEADERS) pprmwait.h primpl.h
include $(MOD_DEPTH)/config/rules.mk
-export:: $(HEADERS)
- $(INSTALL) -m 444 $(HEADERS) $(DIST)/include/private
+export:: $(RELEASE_HEADERS)
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(DIST)/include/private
ifeq ($(MOZ_BITS),16)
- $(INSTALL) -m 444 $(HEADERS) $(MOZ_INCL)/private
+ $(INSTALL) -m 444 $(RELEASE_HEADERS) $(MOZ_INCL)/private
endif
diff --git a/pr/src/bthreads/Makefile b/pr/src/bthreads/Makefile
index 249832cb..4f20d205 100644
--- a/pr/src/bthreads/Makefile
+++ b/pr/src/bthreads/Makefile
@@ -21,7 +21,7 @@ CSRCS += $(BTCSRCS)
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/cplus/Makefile b/pr/src/cplus/Makefile
index 6d08340a..48312806 100644
--- a/pr/src/cplus/Makefile
+++ b/pr/src/cplus/Makefile
@@ -38,7 +38,7 @@ OBJS = $(addprefix $(OBJDIR)/,$(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/io/Makefile b/pr/src/io/Makefile
index 2dc4f01b..47bd41b7 100644
--- a/pr/src/io/Makefile
+++ b/pr/src/io/Makefile
@@ -57,7 +57,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/linking/Makefile b/pr/src/linking/Makefile
index e491a75e..4672384a 100644
--- a/pr/src/linking/Makefile
+++ b/pr/src/linking/Makefile
@@ -34,7 +34,7 @@ CSRCS = \
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/malloc/Makefile b/pr/src/malloc/Makefile
index 2f9c45e8..947c327e 100644
--- a/pr/src/malloc/Makefile
+++ b/pr/src/malloc/Makefile
@@ -30,7 +30,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
CSRCS = prmalloc.c prmem.c
diff --git a/pr/src/md/Makefile b/pr/src/md/Makefile
index 6c60f20b..780fcba2 100644
--- a/pr/src/md/Makefile
+++ b/pr/src/md/Makefile
@@ -48,7 +48,7 @@ CSRCS = \
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/md/beos/Makefile b/pr/src/md/beos/Makefile
index 606e57dd..e286be58 100644
--- a/pr/src/md/beos/Makefile
+++ b/pr/src/md/beos/Makefile
@@ -19,7 +19,7 @@ CSRCS += $(MDCSRCS)
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/md/os2/Makefile b/pr/src/md/os2/Makefile
index feb645ec..77689e24 100644
--- a/pr/src/md/os2/Makefile
+++ b/pr/src/md/os2/Makefile
@@ -38,7 +38,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile
index 0f7b3da6..aed65a70 100644
--- a/pr/src/md/unix/Makefile
+++ b/pr/src/md/unix/Makefile
@@ -259,7 +259,7 @@ ifeq ($(OS_ARCH),SunOS)
endif
endif
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/md/windows/Makefile b/pr/src/md/windows/Makefile
index d939b2fc..32000dc9 100644
--- a/pr/src/md/windows/Makefile
+++ b/pr/src/md/windows/Makefile
@@ -68,7 +68,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/memory/Makefile b/pr/src/memory/Makefile
index 5d3c9761..70326e5a 100644
--- a/pr/src/memory/Makefile
+++ b/pr/src/memory/Makefile
@@ -32,7 +32,7 @@ CSRCS = prseg.c
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/misc/Makefile b/pr/src/misc/Makefile
index 182a4a88..5d70797b 100644
--- a/pr/src/misc/Makefile
+++ b/pr/src/misc/Makefile
@@ -51,7 +51,7 @@ CSRCS = \
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
RELEASE_BINS = compile-et.pl prerr.properties
diff --git a/pr/src/pthreads/Makefile b/pr/src/pthreads/Makefile
index 4ea41113..adae2a78 100644
--- a/pr/src/pthreads/Makefile
+++ b/pr/src/pthreads/Makefile
@@ -37,7 +37,7 @@ CSRCS = \
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/threads/Makefile b/pr/src/threads/Makefile
index f71f4403..d9ce2ca2 100644
--- a/pr/src/threads/Makefile
+++ b/pr/src/threads/Makefile
@@ -66,7 +66,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/src/threads/combined/Makefile b/pr/src/threads/combined/Makefile
index f86f7515..19e676d4 100644
--- a/pr/src/threads/combined/Makefile
+++ b/pr/src/threads/combined/Makefile
@@ -43,7 +43,7 @@ endif
TARGETS = $(OBJS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
include $(MOD_DEPTH)/config/rules.mk
diff --git a/pr/tests/Makefile b/pr/tests/Makefile
index 522295c1..3998e480 100644
--- a/pr/tests/Makefile
+++ b/pr/tests/Makefile
@@ -168,7 +168,7 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
-INCLUDES = -I$(DIST)/include/obsolete -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
diff --git a/pr/tests/selct_nm.c b/pr/tests/selct_nm.c
index 07f03ace..debf84f6 100644
--- a/pr/tests/selct_nm.c
+++ b/pr/tests/selct_nm.c
@@ -46,7 +46,11 @@
#include "prerror.h"
#include "prnetdb.h"
+#ifdef XP_MAC
#include "probslet.h"
+#else
+#include "obsolete/probslet.h"
+#endif
#include <stdio.h>
#include <string.h>
diff --git a/pr/tests/selct_to.c b/pr/tests/selct_to.c
index b71f0d76..e5900ae0 100644
--- a/pr/tests/selct_to.c
+++ b/pr/tests/selct_to.c
@@ -45,7 +45,11 @@
#include "prprf.h"
#include "prnetdb.h"
+#ifdef XP_MAC
#include "probslet.h"
+#else
+#include "obsolete/probslet.h"
+#endif
#include "prerror.h"
diff --git a/pr/tests/w16gui/Makefile b/pr/tests/w16gui/Makefile
index c18b5a54..97b38223 100644
--- a/pr/tests/w16gui/Makefile
+++ b/pr/tests/w16gui/Makefile
@@ -23,7 +23,6 @@ MOD_DEPTH = ../../..
include $(MOD_DEPTH)/config/config.mk
-INCLUDES = -I$(DIST)/include
W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX)
CSRCS = poppad.c \
@@ -33,7 +32,7 @@ CSRCS = poppad.c \
popprnt0.c
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include
LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
LIBPLDS = $(DIST)/lib/plds$(MOD_VERSION).lib
TARGETS = $(OBJDIR)/poppad.exe
diff --git a/tools/Makefile b/tools/Makefile
index 56a8d830..527ca57f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -43,9 +43,9 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
-INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
+INCLUDES = -I$(DIST)/include
-NSPR_VERSION = 21
+NSPR_VERSION = 3
# Setting the variables LDOPTS and LIBPR. We first initialize
# them to the default values, then adjust them for some platforms.
View Lorry Controller Status