diff options
| author | wtc%netscape.com <devnull@localhost> | 1998-12-09 17:39:37 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1998-12-09 17:39:37 +0000 |
| commit | 55e43ff236afd6a26929d39e57fdc3e385c3449a (patch) | |
| tree | 3bfef97b29bb426bc1f38bfad632cbeb7bb03f14 | |
| parent | 8cc36a3f1cc087ccd82047060b2bbb46fb3b6bda (diff) | |
| download | nspr-hg-55e43ff236afd6a26929d39e57fdc3e385c3449a.tar.gz | |
Added build support for the C++ wrappers in pr/src/cplus.
Set USE_CPLUS=1 to recurse into that directory.
| -rw-r--r-- | pr/src/Makefile | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pr/src/Makefile b/pr/src/Makefile index 613a020c..e0709f4d 100644 --- a/pr/src/Makefile +++ b/pr/src/Makefile @@ -27,6 +27,10 @@ ifeq ($(USE_PTHREADS), 1) DIRS += pthreads endif +ifeq ($(USE_CPLUS), 1) + DIRS += cplus +endif + # # Define platform-dependent OS_LIBS # @@ -203,11 +207,24 @@ OBJS += \ threads/combined/$(OBJDIR)/pruthr.$(OBJ_SUFFIX) endif - ifeq ($(USE_IPV6), 1) OBJS += io/$(OBJDIR)/pripv6.$(OBJ_SUFFIX) endif +ifeq ($(USE_CPLUS), 1) +OBJS += \ + cplus/$(OBJDIR)/rcbase.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rccv.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcfileio.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcinrval.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcio.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rclock.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcnetdb.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcnetio.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rcthread.$(OBJ_SUFFIX) \ + cplus/$(OBJDIR)/rctime.$(OBJ_SUFFIX) +endif + ifeq ($(OS_ARCH), WINNT) ifneq (,$(filter-out WIN16 OS2,$(OS_TARGET))) DLLBASE=/BASE:0x30000000 @@ -284,15 +301,11 @@ endif else - THREAD_DIR=threads/combined/$(OBJDIR) +# Unix +include md/unix/objs.mk -ifeq ($(OS_ARCH), MAC) - MD_DIR = md/mac/$(OBJDIR) -else - MD_DIR = md/unix/$(OBJDIR) - include md/unix/objs.mk -endif endif + LIBRARY_NAME = nspr LIBRARY_VERSION = $(MOD_VERSION) |