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.
1999-06-03 22:35:44 +00:00 · 1999-06-03 22:35:44 +00:00 · 328609c46f
--- a/nsprpub/lib/ds/Makefile
+++ b/nsprpub/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 \
--- a/nsprpub/lib/prstreams/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/include/Makefile
+++ b/nsprpub/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
--- a/nsprpub/pr/include/md/Makefile
+++ b/nsprpub/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
--- a/nsprpub/pr/include/obsolete/Makefile
+++ b/nsprpub/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
--- a/nsprpub/pr/include/private/Makefile
+++ b/nsprpub/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
--- a/nsprpub/pr/src/bthreads/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/cplus/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/io/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/linking/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/malloc/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/md/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/md/beos/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/md/os2/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/md/unix/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/md/windows/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/memory/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/misc/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/pthreads/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/threads/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/src/threads/combined/Makefile
+++ b/nsprpub/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

--- a/nsprpub/pr/tests/Makefile
+++ b/nsprpub/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.
--- a/nsprpub/pr/tests/selct_nm.c
+++ b/nsprpub/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>
--- a/nsprpub/pr/tests/selct_to.c
+++ b/nsprpub/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"

--- a/nsprpub/pr/tests/w16gui/Makefile
+++ b/nsprpub/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
--- a/nsprpub/tools/Makefile
+++ b/nsprpub/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.