summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcls%seawood.org <devnull@localhost>1999-12-03 10:33:06 +0000
committercls%seawood.org <devnull@localhost>1999-12-03 10:33:06 +0000
commitbea97d2da617e2ae18fd472b4238485605c5fe7a (patch)
tree39e62376870c7247f543fa8975ec849a6e06a13d
parent442d215ada8f5c0a9b2fb69eba3466802a2fb0ae (diff)
downloadnspr-hg-bea97d2da617e2ae18fd472b4238485605c5fe7a.tar.gz
Disable unneeded arch specific portions of Makefile
-rw-r--r--lib/prstreams/Makefile.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index a3c9f31e..2f31c195 100644
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -26,6 +26,7 @@ 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)
@@ -52,10 +53,11 @@ endif
ifeq ($(OS_ARCH), BeOS)
CFLAGS += -frtti -fexceptions
endif
+endif # !USE_AUTOCONF
INCLUDES = -I$(DIST)/include
-HEADERS = *.h
+HEADERS = $(wildcard $(srcdir)/*.h)
CSRCS = \
plvrsion.c \
@@ -67,6 +69,7 @@ CXXSRCS = \
OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX)))
+ifndef USE_AUTOCONF
ifeq ($(OS_ARCH), WINNT)
ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET)))
EXTRA_LIBS = $(DIST)/lib/nspr$(MOD_VERSION).lib
@@ -124,6 +127,7 @@ endif
ifeq ($(OS_ARCH), UNIXWARE)
OS_LIBS += -lC
endif
+endif # !USE_AUTOCONF
LIBRARY_NAME = prstrms
LIBRARY_VERSION = $(MOD_VERSION)
@@ -168,12 +172,12 @@ $(TINC):
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
ifeq ($(OS_ARCH), WINNT)
ifdef XP_OS2_EMX
- $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
+ $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
else
- $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
+ $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
endif
else
- $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
+ $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
endif
#
# Version information generation (end)