Moved setting of platform specific DLL_SUFFIX to configure.

Removed old unused WINNT ifdefs from rules.mk.

config/rules.mk

@@ -140,38 +140,21 @@ SHARED_LIBRARY		:= $(LIBRARY_NAME).$(DLL_SUFFIX)
 DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)
 IMPORT_LIBRARY		:= $(SHARED_LIBRARY:.dll=.lib)
 else  # OS2
-ifeq ($(OS_ARCH),WINNT)
-SHARED_LIBRARY		:= $(LIBRARY:.lib=.dll)
-else  # WINNT
-ifeq ($(OS_ARCH),BeOS)
-SHARED_LIBRARY		:= $(LIBRARY:.a=.$(DLL_SUFFIX))
-else
 
+
+ifeq (,$(filter-out BeOS, $(OS_ARCH)))
 # Unix only
 ifdef LIB_IS_C_ONLY
 MKSHLIB			= $(MKCSHLIB)
 endif
+endif
 
-ifeq ($(OS_ARCH),HP-UX)
-SHARED_LIBRARY		:= $(LIBRARY:.a=.sl)
-else  # HPUX
-ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1)
-SHARED_LIBRARY		:= $(LIBRARY:.a=.so.1.0)
-else  # SunOS4
-ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
-SHARED_LIBRARY		:= $(LIBRARY:.a=)_shr.a
-else  # AIX
-SHARED_LIBRARY		:= $(LIBRARY:.a=.$(DLL_SUFFIX))
-endif # AIX
-endif # SunOS4
-endif # HPUX
+SHARED_LIBRARY		:= $(LIBRARY:.$(LIB_SUFFIX)=$(DLL_SUFFIX))
 
-endif # BeOS
-endif # WINNT
 endif # OS2
 endif # MKSHLIB
 endif # !NO_SHARED_LIB
-endif
+endif # LIBRARY
 
 ifdef NO_STATIC_LIB
 LIBRARY			= $(NULL)
@@ -596,9 +579,6 @@ $(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(LD) -FREE -OUT:$@ $(LDFLAGS) $(OS_LFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) -MAP:$(@:.exe=.map) $(OS_LIBS) /ST:0x1000000
 else
-ifeq ($(OS_ARCH),WINNT)
-	$(CC) $(PROGOBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
-else
 ifeq ($(CPP_PROG_LINK),1)
 	$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB)
 	$(MOZ_POST_PROGRAM_COMMAND) $@
@@ -607,18 +587,17 @@ ifdef BEOS_PROGRAM_RESOURCE
 	xres -o $@ $(BEOS_PROGRAM_RESOURCE)
 	mimeset $@
 endif
-endif
-else
+endif # BeOS
+else # ! CPP_PROG_LINK
 	$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
 ifeq ($(OS_ARCH),BeOS)
 ifdef BEOS_PROGRAM_RESOURCE
 	xres -o $@ $(BEOS_PROGRAM_RESOURCE)
 	mimeset $@
 endif
-endif
-endif
-endif
-endif
+endif # BeOS
+endif # CPP_PROG_LINK
+endif # OS2
 
 $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
@@ -773,39 +752,27 @@ $(SHARED_LIBRARY): $(OBJS) $(DEF_FILE) Makefile Makefile.in
 	$(MOZ_POST_DSO_LIB_COMMAND) $@
 endif
 
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),OS2)
 $(DLL): $(OBJS) $(EXTRA_LIBS)
 	rm -f $@
-ifeq ($(OS_ARCH),OS2)
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
-else
-	$(LINK_DLL) $(OBJS) $(OS_LIBS) $(EXTRA_LIBS)
-endif
 endif
 
 %: %.c
 	$(REPORT_BUILD)
-ifneq (,$(filter WINNT,$(OS_ARCH)))
-	$(ELOG) $(CC) -Fo$@ -c $(CFLAGS) $<
-else
 ifeq ($(MOZ_OS2_TOOLS), VACPP)
 	$(ELOG) $(CC) -Fo$@ -c $(CFLAGS) $<
 else
 	$(ELOG) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 endif
-endif
 
 %.o: %.c Makefile.in
 	$(REPORT_BUILD)
-ifneq (,$(filter WINNT,$(OS_ARCH)))
-	$(ELOG) $(CC) -Fo$@ -c $(CFLAGS) $<
-else
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 	$(ELOG) $(CC) -Fo$@ -c $(COMPILE_CFLAGS) $<
 else
 	$(ELOG) $(CC) -o $@ -c $(COMPILE_CFLAGS) $<
 endif
-endif
 
 %.ho: %.c Makefile.in
 	$(REPORT_BUILD)
@@ -839,15 +806,11 @@ ifdef STRICT_CPLUSPLUS_SUFFIX
 	$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) t_$*.cc
 	rm -f t_$*.cc
 else
-ifneq (,$(filter WINNT,$(OS_ARCH)))
-	$(ELOG) $(CCC) -Fo$@ -c $(CXXFLAGS) $<
-else
 ifeq ($(MOZ_OS2_TOOLS), VACPP)
 	$(ELOG) $(CCC) -Fo$@ -c $(COMPILE_CXXFLAGS) $<
 else
 	$(ELOG) $(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $<
 endif
-endif
 endif #STRICT_CPLUSPLUS_SUFFIX
 
 %.i: %.cpp

configure.in

@@ -328,7 +328,7 @@ AR_EXTRACT='$(AR) x'
 AR_DELETE='$(AR) d'
 AS='$(CC)'
 AS_DASH_C_FLAG='-c'
-DLL_SUFFIX=so
+DLL_SUFFIX=.so
 OBJ_SUFFIX=o
 LIB_SUFFIX=a
 TARGET_MD_ARCH=unix
@@ -499,11 +499,16 @@ dnl ========================================================
 case "$target" in
 *-aix*)
     if test ! "$GNU_CC"; then
-	# DSO_LDOPTS='-ldl -bM:SRE -p1 -brtl -bso -bexpall -bnoentry'
-	DSO_LDOPTS='-ldl -p1 -brtl -bso'
-	DSO_CFLAGS='-qflag=w:w'
-	DSO_PIC_CFLAGS='-DPIC'
+	    # DSO_LDOPTS='-ldl -bM:SRE -p1 -brtl -bso -bexpall -bnoentry'
+	    DSO_LDOPTS='-ldl -p1 -brtl -bso'
+	    DSO_CFLAGS='-qflag=w:w'
+	    DSO_PIC_CFLAGS='-DPIC'
     fi
+    case "$(target_os)" in
+    aix4.1*)
+        DLL_SUFFIX='_shr.a'
+        ;;
+    esac
     MKSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
     MKCSHLIB='$(AIX_SHLIB_BIN) $(DSO_LDOPTS)'
     AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
@@ -535,7 +540,7 @@ case "$target" in
 
 *-freebsd*)
     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-	DLL_SUFFIX="so.1.0"
+	DLL_SUFFIX=".so.1.0"
 	DSO_LDOPTS="-shared"
     fi
     if test ! "$GNU_CC"; then
@@ -549,7 +554,7 @@ case "$target" in
     ;; 
 
 *-hpux*)
-    DLL_SUFFIX="sl"
+    DLL_SUFFIX=".sl"
     if test ! "$GNU_CC"; then
 	DSO_LDOPTS='-b -Wl,+s -L$(DIST)/bin'
 	DSO_CFLAGS=""
@@ -622,7 +627,7 @@ case "$target" in
     if test -z "$GNU_CC"; then
 	OBJ_SUFFIX=obj
 	LIB_SUFFIX=lib
-	DLL_SUFFIX=dll
+	DLL_SUFFIX=.dll
     fi
     MKSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $(LIBRARY_NAME).dll --output-lib $@'
     MKCSHLIB='$(DLLTOOL) --as=$(AS) -k --dllname $(LIBRARY_NAME).dll --output-lib $@'
@@ -652,7 +657,7 @@ case "$target" in
     ;;
 
 *-netbsd*)
-    DLL_SUFFIX="so.1.0"
+    DLL_SUFFIX=".so.1.0"
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     CFLAGS="$CFLAGS -Dunix"
@@ -710,7 +715,7 @@ case "$target" in
     ;;
 
 *-openbsd*)
-    DLL_SUFFIX="so.1.0"
+    DLL_SUFFIX=".so.1.0"
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -h $@'
@@ -769,7 +774,7 @@ alpha*-*-osf*)
     ;;
 
 *-rhapsody*) 
-    DLL_SUFFIX="dylib"
+    DLL_SUFFIX=".dylib"
     DSO_LDOPTS='-compatibility_version 1 -current_version 1'
     AC_DEFINE(NO_X11)
     AC_DEFINE(RHAPSODY)
@@ -845,6 +850,11 @@ dnl the qsort routine under solaris is faulty
     MKCSHLIB='-$(LD) $(DSO_LDOPTS)'
     AC_DEFINE(SUNOS4)
     AC_DEFINE(SPRINTF_RETURNS_STRING)
+    case "$(target_os)" in
+    sunos4.1*)
+        DLL_SUFFIX='.so.1.0'
+        ;;
+    esac
     ;;
 
 *-sysv4.2uw7*) 
@@ -3342,7 +3352,7 @@ AC_SUBST(DSO_CFLAGS)
 AC_SUBST(DSO_PIC_CFLAGS)
 AC_SUBST(DSO_LDOPTS)
 AC_SUBST(DLL_SUFFIX)
-AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, ".$DLL_SUFFIX")
+AC_DEFINE_UNQUOTED(MOZ_DLL_SUFFIX, "$DLL_SUFFIX")
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(OBJ_SUFFIX)