[Amizilla-cvs] amizilla/xpcom/sample Makefile.in,1.1.1.2,1.2

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

Update of /cvsroot/amizilla/amizilla/xpcom/sample
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3224/sample

Modified Files:
	Makefile.in 
Log Message:
AmigaOS build rules.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/amizilla/amizilla/xpcom/sample/Makefile.in,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** Makefile.in	29 Jun 2004 10:42:40 -0000	1.1.1.2
--- Makefile.in	11 Oct 2004 21:19:49 -0000	1.2
***************
*** 53,59 ****
  TESTCPPSRCS	= nsTestSample.cpp
  
  CPPSRCS		+= $(TESTCPPSRCS)
- 
  SIMPLE_PROGRAMS	= $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))
  
  include $(topsrcdir)/config/config.mk
--- 53,66 ----
  TESTCPPSRCS	= nsTestSample.cpp
  
+ #
+ # AmigaOS needs different CFLAGS for the test programs. Here is a quick hack 
+ # to do it
+ #
+ ifeq ($(OS_ARCH), AmigaOS)
+ TSIMPLE_PROGRAMS	= $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))
+ else
  CPPSRCS		+= $(TESTCPPSRCS)
  SIMPLE_PROGRAMS	= $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX))
+ endif
  
  include $(topsrcdir)/config/config.mk
***************
*** 90,97 ****
  include $(topsrcdir)/config/rules.mk
  
! libs:: $(TARGETS)
  	$(INSTALL) $(srcdir)/xpconnect-sample.html $(DIST)/bin/res/samples
  
  install:: $(TARGETS)
  	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/xpconnect-sample.html $(DESTDIR)$(mozappdir)/res/samples
  
--- 97,115 ----
  include $(topsrcdir)/config/rules.mk
  
! libs::$(TARGETS) testsimple
  	$(INSTALL) $(srcdir)/xpconnect-sample.html $(DIST)/bin/res/samples
  
+ testsimple: 
+ ifeq ($(OS_ARCH), amigaos)
+ 	make FORCE_NO_PIC=1 SIMPLE_PROGRAMS="$(TSIMPLE_PROGRAMS)" $(TSIMPLE_PROGRAMS)
+ endif
+ 
  install:: $(TARGETS)
  	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/xpconnect-sample.html $(DESTDIR)$(mozappdir)/res/samples
  
+ testsimpleclean:
+ ifeq ($(OS_ARCH), amigaos)
+ 	-rm $(TSIMPLE_PROGRAMS)
+ endif
+ 
+ clean:: testsimpleclean