diff options
Diffstat (limited to 'lib/prstreams/Makefile.in')
| -rw-r--r-- | lib/prstreams/Makefile.in | 91 |
1 files changed, 39 insertions, 52 deletions
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index 8e64814b..7bfc3358 100644 --- a/lib/prstreams/Makefile.in +++ b/lib/prstreams/Makefile.in @@ -26,36 +26,34 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF # Disable optimization of the nspr on SunOS4.1.3 ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1.3_U1) OPTIMIZER = else - # The C++ compiler in Workshop 5.0 uses standard - # iostreams as default. -library=iostream will - # allow Workshop 5.0 to work with classic iostreams. - ifndef NS_USE_GCC - CCC_VERSION := $(shell $(CCC) -V 2>&1) - ifneq (,$(findstring 5.0,$(CCC_VERSION))) - CCC_ONLY_FLAGS += -library=iostream - endif - endif + # The C++ compiler in Workshop 5.0 uses standard + # iostreams as default. -library=iostream will + # allow Workshop 5.0 to work with classic iostreams. + ifndef NS_USE_GCC + CCC_VERSION := $(shell $(CCC) -V 2>&1) + ifneq (,$(findstring 5.0,$(CCC_VERSION))) + CCC_ONLY_FLAGS += -library=iostream + endif + endif endif endif ifeq ($(OS_ARCH), IRIX) ifneq ($(OS_RELEASE),5.3) - CCC_ONLY_FLAGS += -exceptions + CCC_ONLY_FLAGS += -exceptions endif endif ifeq ($(OS_ARCH), BeOS) CFLAGS += -frtti -fexceptions endif -endif # !USE_AUTOCONF -INCLUDES = -I$(DIST)/include +INCLUDES = -I$(dist_includedir) HEADERS = $(wildcard $(srcdir)/*.h) @@ -69,21 +67,19 @@ CXXSRCS = \ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) -ifndef USE_AUTOCONF +LIBRARY_NAME = prstrms +LIBRARY_VERSION = $(MOD_MAJOR_VERSION) + +RELEASE_HEADERS = $(HEADERS) +RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) +RELEASE_LIBS = $(TARGETS) + +include $(topsrcdir)/config/rules.mk + ifeq ($(OS_ARCH), WINNT) - ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET))) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib - else - DLLBASE=/BASE:0x30000000 + DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/prstrms.res RESNAME=prstrms.rc - OS_LIBS = user32.lib - ifeq ($(OS_TARGET), WIN95) - EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib - else - EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib - endif - endif else ifeq ($(OS_ARCH), AIX) ifeq ($(OS_RELEASE), 4.1) @@ -103,11 +99,6 @@ else OS_LIBS += -ldl endif endif - ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION)_shr - else - EXTRA_LIBS = -L$(DIST)/lib -lnspr$(MOD_VERSION) - endif endif # On NCR and SCOOS, we can't link with extra libraries when @@ -121,26 +112,23 @@ ifeq ($(OS_ARCH),SCOOS) EXTRA_LIBS = endif ifeq ($(OS_ARCH),BeOS) - EXTRA_LIBS = -lstdc++.r4 -L$(DIST)/lib -lnspr$(MOD_VERSION) + EXTRA_LIBS = -lstdc++.r4 -L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION) endif ifeq ($(OS_ARCH), UNIXWARE) OS_LIBS += -lC endif -endif # !USE_AUTOCONF -ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(DIST)/lib -lnspr$(MOD_VERSION) +ifeq ($(OS_ARCH),WINNT) +OS_LIBS += user32.lib endif -LIBRARY_NAME = prstrms -LIBRARY_VERSION = $(MOD_VERSION) +EXTRA_LIBS = $(LIBNSPR) -RELEASE_HEADERS = $(HEADERS) -RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) -RELEASE_LIBS = $(TARGETS) +ifdef RESOLVE_LINK_SYMBOLS +EXTRA_LIBS += $(OS_LIBS) +endif -include $(topsrcdir)/config/rules.mk # # Version information generation (begin) @@ -153,11 +141,7 @@ 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 @@ -175,31 +159,34 @@ $(TINC): $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) ifeq ($(OS_ARCH), WINNT) -ifdef XP_OS2_EMX $(CC) -o $@ -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) # export:: $(TARGETS) $(HEADERS) - $(INSTALL) -m 444 $(HEADERS) $(DIST)/include - $(INSTALL) -m 444 $(TARGETS) $(DIST)/lib + $(INSTALL) -m 444 $(HEADERS) $(dist_includedir) + $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) +ifeq ($(OS_ARCH),OS2) + $(INSTALL) -m 444 $(TARGETS) $(dist_bindir) +endif ifeq ($(OS_ARCH),HP-UX) ifdef SHARED_LIBRARY - $(INSTALL) -m 755 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) endif endif ifeq ($(OS_ARCH),OpenVMS) - $(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_libdir) ifdef SHARED_LIBRARY - $(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 -install:: export |