Browse Source

+ also copy smartlibs if they exist

pierre 25 years ago
parent
commit
17ee448ad9
2 changed files with 56 additions and 78 deletions
  1. 29 60
      tests/units/Makefile
  2. 27 18
      tests/units/Makefile.fpc

+ 29 - 60
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.15 [2000/07/02]
+# Makefile generated by fpcmake v0.99.15 [2000/06/15]
 #
 
 defaultrule: current
@@ -532,19 +532,6 @@ DOCINSTALLDIR=$(BASEINSTALLDIR)/doc
 endif
 endif
 
-# Where to install the examples, under linux we use the doc dir
-# because the copytree command will create a subdir itself
-ifndef EXAMPLEINSTALLDIR
-ifdef inlinux
-EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples
-else
-EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples
-endif
-ifdef EXAMPLESUBDIR
-EXAMPLEINSTALLDIR:=$(EXAMPLEINSTALLDIR)/$(EXAMPLESUBDIR)
-endif
-endif
-
 # Where the some extra (data)files will be stored
 ifndef DATAINSTALLDIR
 DATAINSTALLDIR=$(BASEINSTALLDIR)
@@ -693,21 +680,17 @@ install: fpc_install
 
 sourceinstall: fpc_sourceinstall
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
 
-zipexampleinstall: fpc_zipexampleinstall
-
 distclean: fpc_distclean
 
 cleanall: fpc_cleanall
 
 info: fpc_info
 
-.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
 
 #####################################################################
 # General compile rules
@@ -857,24 +840,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
-#####################################################################
-# exampleinstall rules
-#####################################################################
-
-.PHONY: fpc_exampleinstall
-
-fpc_exampleinstall: $(addsuffix _clean,$(EXAMPLEDIROBJECTS))
-ifdef EXAMPLESOURCEFILES
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPY) $(EXAMPLESOURCEFILES) $(EXAMPLEINSTALLDIR)
-endif
-ifdef EXAMPLEDIROBJECTS
-ifndef EXAMPLESOURCEFILES
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-endif
-	$(COPYTREE) $(addsuffix /*,$(EXAMPLEDIROBJECTS)) $(EXAMPLEINSTALLDIR)
-endif
-
 #####################################################################
 # Zip
 #####################################################################
@@ -936,11 +901,6 @@ endif
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
-.PHONY:  fpc_zipexampleinstall
-
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1072,39 +1032,48 @@ current : $(OS_TARGET)_units
 go32v2_units : 
 	$(MAKE) clean OS_TARGET=go32v2
 	$(MAKE) -C ../../rtl/go32v2 clean all OS_TARGET=go32v2
-	$(COPY) ../../rtl/go32v2/*.o .
-	$(COPY) ../../rtl/go32v2/*.ppu .
+	-$(COPY) ../../rtl/go32v2/*.o .
+	-$(COPY) ../../rtl/go32v2/*.a .
+	-$(COPY) ../../rtl/go32v2/*.ppu .
 	$(MAKE) -C ../../fcl/go32v2 clean all OS_TARGET=go32v2
-	$(COPY) ../../fcl/go32v2/*.o .
-	$(COPY) ../../fcl/go32v2/*.ppu .
+	-$(COPY) ../../fcl/go32v2/*.o .
+	-$(COPY) ../../fcl/go32v2/*.a .
+	-$(COPY) ../../fcl/go32v2/*.ppu .
 
 linux_units : 
 	$(MAKE) clean OS_TARGET=linux
 	$(MAKE) -C ../../rtl/linux clean all OS_TARGET=linux
-	$(COPY) ../../rtl/linux/*.o .
-	$(COPY) ../../rtl/linux/*.ppu .
+	-$(COPY) ../../rtl/linux/*.o .
+	-$(COPY) ../../rtl/linux/*.a .
+	-$(COPY) ../../rtl/linux/*.ppu .
 	$(MAKE) -C ../../fcl/linux clean all OS_TARGET=linux
-	$(COPY) ../../fcl/linux/*.o .
-	$(COPY) ../../fcl/linux/*.ppu .
+	-$(COPY) ../../fcl/linux/*.o .
+	-$(COPY) ../../fcl/linux/*.a .
+	-$(COPY) ../../fcl/linux/*.ppu .
 
 os2_units : 
 	$(MAKE) clean OS_TARGET=os2
 	$(MAKE) -C ../../rtl/os2 clean all OS_TARGET=os2
-	$(COPY) ../../rtl/os2/*.oo2 .
-	$(COPY) ../../rtl/os2/*.ppo .
+	-$(COPY) ../../rtl/os2/*.oo2 .
+	-$(COPY) ../../rtl/os2/*.ao2 .
+	-$(COPY) ../../rtl/os2/*.ppo .
 	$(MAKE) -C ../../fcl/os2 clean all OS_TARGET=os2
-	$(COPY) ../../fcl/os2/*.oo2 .
-	$(COPY) ../../fcl/os2/*.ppo .
+	-$(COPY) ../../fcl/os2/*.oo2 .
+	-$(COPY) ../../fcl/os2/*.ao2 .
+	-$(COPY) ../../fcl/os2/*.ppo .
 
 win32_units : 
 	$(MAKE) clean OS_TARGET=win32
 	$(MAKE) -C ../../rtl/win32 clean all OS_TARGET=win32
-	$(COPY) ../../rtl/win32/*.ow .
-	$(COPY) ../../rtl/win32/*.ppw .
+	-$(COPY) ../../rtl/win32/*.ow .
+	-$(COPY) ../../rtl/win32/*.aw .
+	-$(COPY) ../../rtl/win32/*.ppw .
 	$(MAKE) -C ../../fcl/win32 clean all OS_TARGET=win32
-	$(COPY) ../../fcl/win32/*.ow .
-	$(COPY) ../../fcl/win32/*.ppw .
+	-$(COPY) ../../fcl/win32/*.ow .
+	-$(COPY) ../../fcl/win32/*.aw .
+	-$(COPY) ../../fcl/win32/*.ppw .
 
 clean :
-	$(RM) *$(OEXT)
-	$(RM) *$(PPUEXT)
+	-$(RM) *$(OEXT)
+	-$(RM) *$(PPUEXT)
+	-$(RM) *$(STATICLIBEXT)

+ 27 - 18
tests/units/Makefile.fpc

@@ -16,39 +16,48 @@ current : $(OS_TARGET)_units
 go32v2_units : 
 	$(MAKE) clean OS_TARGET=go32v2
 	$(MAKE) -C ../../rtl/go32v2 clean all OS_TARGET=go32v2
-	$(COPY) ../../rtl/go32v2/*.o .
-	$(COPY) ../../rtl/go32v2/*.ppu .
+	-$(COPY) ../../rtl/go32v2/*.o .
+	-$(COPY) ../../rtl/go32v2/*.a .
+	-$(COPY) ../../rtl/go32v2/*.ppu .
 	$(MAKE) -C ../../fcl/go32v2 clean all OS_TARGET=go32v2
-	$(COPY) ../../fcl/go32v2/*.o .
-	$(COPY) ../../fcl/go32v2/*.ppu .
+	-$(COPY) ../../fcl/go32v2/*.o .
+	-$(COPY) ../../fcl/go32v2/*.a .
+	-$(COPY) ../../fcl/go32v2/*.ppu .
 
 linux_units : 
 	$(MAKE) clean OS_TARGET=linux
 	$(MAKE) -C ../../rtl/linux clean all OS_TARGET=linux
-	$(COPY) ../../rtl/linux/*.o .
-	$(COPY) ../../rtl/linux/*.ppu .
+	-$(COPY) ../../rtl/linux/*.o .
+	-$(COPY) ../../rtl/linux/*.a .
+	-$(COPY) ../../rtl/linux/*.ppu .
 	$(MAKE) -C ../../fcl/linux clean all OS_TARGET=linux
-	$(COPY) ../../fcl/linux/*.o .
-	$(COPY) ../../fcl/linux/*.ppu .
+	-$(COPY) ../../fcl/linux/*.o .
+	-$(COPY) ../../fcl/linux/*.a .
+	-$(COPY) ../../fcl/linux/*.ppu .
 
 os2_units : 
 	$(MAKE) clean OS_TARGET=os2
 	$(MAKE) -C ../../rtl/os2 clean all OS_TARGET=os2
-	$(COPY) ../../rtl/os2/*.oo2 .
-	$(COPY) ../../rtl/os2/*.ppo .
+	-$(COPY) ../../rtl/os2/*.oo2 .
+	-$(COPY) ../../rtl/os2/*.ao2 .
+	-$(COPY) ../../rtl/os2/*.ppo .
 	$(MAKE) -C ../../fcl/os2 clean all OS_TARGET=os2
-	$(COPY) ../../fcl/os2/*.oo2 .
-	$(COPY) ../../fcl/os2/*.ppo .
+	-$(COPY) ../../fcl/os2/*.oo2 .
+	-$(COPY) ../../fcl/os2/*.ao2 .
+	-$(COPY) ../../fcl/os2/*.ppo .
 
 win32_units : 
 	$(MAKE) clean OS_TARGET=win32
 	$(MAKE) -C ../../rtl/win32 clean all OS_TARGET=win32
-	$(COPY) ../../rtl/win32/*.ow .
-	$(COPY) ../../rtl/win32/*.ppw .
+	-$(COPY) ../../rtl/win32/*.ow .
+	-$(COPY) ../../rtl/win32/*.aw .
+	-$(COPY) ../../rtl/win32/*.ppw .
 	$(MAKE) -C ../../fcl/win32 clean all OS_TARGET=win32
-	$(COPY) ../../fcl/win32/*.ow .
-	$(COPY) ../../fcl/win32/*.ppw .
+	-$(COPY) ../../fcl/win32/*.ow .
+	-$(COPY) ../../fcl/win32/*.aw .
+	-$(COPY) ../../fcl/win32/*.ppw .
 
 clean :
-	$(RM) *$(OEXT)
-	$(RM) *$(PPUEXT)
+	-$(RM) *$(OEXT)
+	-$(RM) *$(PPUEXT)
+	-$(RM) *$(STATICLIBEXT)