Disable unneeded arch specific portions of Makefile

nsprpub/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)