summaryrefslogtreecommitdiff
path: root/pr/src/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'pr/src/Makefile.in')
-rw-r--r--pr/src/Makefile.in167
1 files changed, 45 insertions, 122 deletions
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index bad88779..55e96907 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -28,6 +28,11 @@ include $(topsrcdir)/config/config.mk
DIRS = io linking malloc md memory misc threads
+# For VAC++ 4 geticcdata rule in config/OS2.mk
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+CSRCS = prvrsion.c
+endif
+
ifeq ($(USE_PTHREADS), 1)
DIRS += pthreads
endif
@@ -40,8 +45,6 @@ ifeq ($(USE_CPLUS), 1)
DIRS += cplus
endif
-ifndef USE_AUTOCONF
-
#
# Define platform-dependent OS_LIBS
#
@@ -49,8 +52,6 @@ ifndef USE_AUTOCONF
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
-OPTIMIZER =
-export OPTIMIZER
OS_LIBS = -lm
else # 4.1.3_U1
ifdef USE_PTHREADS
@@ -100,7 +101,7 @@ endif
ifeq ($(OS_ARCH),OSF1)
ifeq ($(USE_PTHREADS), 1)
-OS_LIBS = -lpthread
+OS_LIBS = -lpthread -lrt
endif
ifneq ($(OS_RELEASE),V2.0)
OS_LIBS += -lc_r
@@ -120,7 +121,7 @@ ifeq ($(USE_PTHREADS), 1)
ifeq (,$(filter-out B.10.10 B.10.20,$(OS_RELEASE)))
OS_LIBS = -ldce
else
-OS_LIBS = -lpthread
+OS_LIBS = -lpthread -lrt
endif
endif
ifeq ($(PTHREADS_USER), 1)
@@ -142,16 +143,15 @@ OS_LIBS = -lsocket -lnsl -lgen -lresolv
endif
ifeq ($(OS_ARCH),WINNT)
-ifeq ($(OS_TARGET),OS2)
-# We define this in os2.mk.
-else
-ifneq ($(OS_TARGET),WIN16)
-OS_LIBS = wsock32.lib winmm.lib
-endif
+OS_LIBS = advapi32.lib wsock32.lib
endif
+
+ifdef GC_LEAK_DETECTOR
+EXTRA_LIBS = -L$(dist_libdir) -lboehm
endif
-endif # USE_AUTOCONF
+EXTRA_LIBS += $(OS_LIBS)
+
#
# Define platform-dependent OBJS
#
@@ -174,7 +174,6 @@ OBJS = \
threads/$(OBJDIR)/prrwlock.$(OBJ_SUFFIX) \
threads/$(OBJDIR)/prtpd.$(OBJ_SUFFIX) \
linking/$(OBJDIR)/prlink.$(OBJ_SUFFIX) \
- malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX) \
malloc/$(OBJDIR)/prmem.$(OBJ_SUFFIX) \
md/$(OBJDIR)/prosdep.$(OBJ_SUFFIX) \
memory/$(OBJDIR)/prshm.$(OBJ_SUFFIX) \
@@ -198,9 +197,15 @@ OBJS = \
misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \
misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \
misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \
+ misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \
misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \
misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX)
+# ilib now rejects empty objects
+ifneq ($(MOZ_OS2_TOOLS),VACPP)
+OBJS += malloc/$(OBJDIR)/prmalloc.$(OBJ_SUFFIX)
+endif
+
ifdef USE_PTHREADS
OBJS += \
pthreads/$(OBJDIR)/ptsynch.$(OBJ_SUFFIX) \
@@ -244,109 +249,23 @@ OBJS += \
cplus/$(OBJDIR)/rctime.$(OBJ_SUFFIX)
endif
-ifdef USE_AUTOCONF
-
-include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
-ifdef USE_BTHREADS
-include $(srcdir)/bthreads/objs.mk
+ifdef GC_LEAK_DETECTOR
+OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX)
endif
-else
-
ifeq ($(OS_ARCH), WINNT)
-ifneq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/nspr.res
RESNAME=nspr.rc
-ifdef MOZ_DEBUG
-ifdef GLOWCODE
-EXTRA_LIBS += $(GLOWDIR)/glowcode.lib
-endif
-endif
-endif
-
-ifeq ($(OS_TARGET), WIN16)
-OBJS += md/windows/$(OBJDIR)/w16null.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16proc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16thred.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16fmem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16sock.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16mem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16io.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16gc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16error.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w16callb.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX)
-EXTRA_LIBS += $(MOD_DEPTH)/tools/winsock.lib
-W16_EXPORTS = EXPORT _malloc.2=_PR_MD_malloc RESIDENT, \
- _realloc.3=_PR_MD_realloc RESIDENT, \
- _calloc.4=_PR_MD_calloc RESIDENT, \
- _free.5=_PR_MD_free RESIDENT, \
- _getenv.9=_PR_MD_getenv RESIDENT, \
- _printf.11=_PR_MD_printf RESIDENT, \
- _strftime.13=_PR_MD_strftime RESIDENT, \
- _sscanf.33=_PR_MD_sscanf RESIDENT, \
- _putenv.10=_PR_MD_putenv RESIDENT, \
- _fprintf.12=_PR_MD_fprintf RESIDENT
-else
-ifeq ($(OS_TARGET), WIN95)
-OBJS += md/windows/$(OBJDIR)/w95io.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w95sock.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w95thred.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w95cv.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w95dllmain.$(OBJ_SUFFIX)
-else
-ifeq ($(OS_TARGET),OS2)
-OBJS += md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2sock.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2thred.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2cv.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2gc.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2misc.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2inrval.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2sem.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2_errors.$(OBJ_SUFFIX) \
- md/os2/$(OBJDIR)/os2poll.$(OBJ_SUFFIX)
-else
-OBJS += md/windows/$(OBJDIR)/ntdllmn.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntio.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntthread.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \
- md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX)
-endif
-endif
-endif
-
-else
+endif # WINNT
-ifeq ($(OS_ARCH), BeOS)
- include $(srcdir)/md/beos/objs.mk
- include $(srcdir)/bthreads/objs.mk
-else
- # Unix
- include $(srcdir)/md/unix/objs.mk
-endif
+include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
+ifdef USE_BTHREADS
+include $(srcdir)/bthreads/objs.mk
endif
-endif # !USE_AUTOCONF
LIBRARY_NAME = nspr
-LIBRARY_VERSION = $(MOD_VERSION)
+LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
RELEASE_LIBS = $(TARGETS)
@@ -361,25 +280,29 @@ endif
# Version information generation (begin)
#
ECHO = echo
-INCLUDES = -I$(DIST)/include
+INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
TINC = $(OBJDIR)/_pr_bld.h
+
+ifeq ($(OS_TARGET),OS2)
+PROD = nspr$(MOD_MAJOR_VERSION).$(DLL_SUFFIX)
+else
PROD = $(notdir $(SHARED_LIBRARY))
+endif
+
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
SH_DATE = $(shell date)
SH_NOW = $(shell $(NOW))
ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),OS2)
- SUF =
-else
SUF = i64
-endif
else
SUF = LL
endif
DEFINES += -D_NSPR_BUILD_
+GARBAGE += $(TINC)
+
$(TINC):
@$(MAKE_OBJDIR)
@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
@@ -393,35 +316,36 @@ $(TINC):
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
ifeq ($(OS_ARCH), WINNT)
-ifdef XP_OS2_EMX
- $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
+ $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
else
+ifeq ($(MOZ_OS2_TOOLS), VACPP)
$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
-endif
else
$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
endif
+endif
#
# Version information generation (end)
#
#
-# The Client build wants the shared libraries in $(DIST)/bin,
+# The Client build wants the shared libraries in $(dist_bindir)
# so we also install them there.
#
export:: $(TARGETS)
- $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib
+ $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
ifdef SHARED_LIBRARY
ifeq ($(OS_ARCH),HP-UX)
- $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib
- $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/bin
+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
else
- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/bin
+ $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
endif
ifeq ($(OS_ARCH), OpenVMS)
- $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(DIST)/lib
+ $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_libdir)
+ $(INSTALL) -m 444 $(SHARED_LIBRARY:.$(DLL_SUFFIX)=.vms) $(dist_bindir)
endif
endif
ifeq ($(MOZ_BITS),16)
@@ -434,5 +358,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
rtl_enable -o $@ $<
endif
-install:: export
View Lorry Controller Status