[Amizilla-cvs] amizilla/js/src Makefile.in,1.2,1.3

[Jeff S. <jsh...@us...>]

Update of /cvsroot/amizilla/amizilla/js/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29216/src

Modified Files:
	Makefile.in 
Log Message:
AmigaOS build rules and shared library support.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/amizilla/amizilla/js/src/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	25 Jun 2004 12:13:42 -0000	1.2
--- Makefile.in	11 Oct 2004 20:53:20 -0000	1.3
***************
*** 56,64 ****
  FORCE_SHARED_LIB = 1
  
- ifeq ($(OS_ARCH),AmigaOS)
- # Sorry, but so far we don't have shared linker libs on the Amiga
- FORCE_SHARED_LIB = 
- endif
- 
  
  CSRCS		= \
--- 56,59 ----
***************
*** 161,165 ****
  EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
  
! ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
  SHARED_LIBRARY_LIBS += $(FDLIBM_LIBRARY)
  endif
--- 156,160 ----
  EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
  
! ifeq (,$(filter-out OS2 WINNT AmigaOS,$(OS_ARCH)))
  SHARED_LIBRARY_LIBS += $(FDLIBM_LIBRARY)
  endif
***************
*** 242,246 ****
  
  # BeOS and HP-UX do not require the extra linking of "-lm"
! ifeq (,$(filter BeOS HP-UX WINNT OpenVMS,$(OS_ARCH)))
  LDFLAGS		+= -lm
  endif
--- 237,241 ----
  
  # BeOS and HP-UX do not require the extra linking of "-lm"
! ifeq (,$(filter BeOS HP-UX WINNT OpenVMS AmigaOS,$(OS_ARCH)))
  LDFLAGS		+= -lm
  endif
***************
*** 292,295 ****
--- 287,293 ----
  endif
  endif
+ ifeq ($(OS_ARCH),amigaos)
+ OBJS		+= fdlibm/*.o
+ endif
  
  ifeq ($(OS_ARCH),IRIX)
***************
*** 320,325 ****
--- 318,328 ----
  endif
  else
+ else
+ ifeq ($(OS_TARGET), amigaos)
+ 	@cp $(JSMATH_PRELINK) $@
+ else
  	$(LD) $(DASH_R) -o $@ $(JSMATH_PRELINK) $(FDLIBM_LIBRARY)
  endif
+ endif
  	@$(RM) -f $(JSMATH_PRELINK)
  else