Browse Source

* merged fixes from Michael

peter 26 years ago
parent
commit
c29c66da40
1 changed files with 9 additions and 3 deletions
  1. 9 3
      base/makefile.fpc

+ 9 - 3
base/makefile.fpc

@@ -569,6 +569,7 @@ ifndef NODEFAULTRULES
 
 
 # Create Filenames
 # Create Filenames
 EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
+EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 UNITFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
 UNITFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
 UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS))
 UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS))
 
 
@@ -639,7 +640,7 @@ ifdef UNITOBJECTS
 ifeq ($(SMARTLINK),YES)
 ifeq ($(SMARTLINK),YES)
 	$(INSTALL) $(LIBPREFIX)$(LIBNAME)$(LIBEXT) $(UNITINSTALLDIR)
 	$(INSTALL) $(LIBPREFIX)$(LIBNAME)$(LIBEXT) $(UNITINSTALLDIR)
 else
 else
-	-$(INSTALL) *$(OEXT) $(UNITINSTALLDIR)
+	-$(INSTALL) $(UNITOFILES) $(UNITINSTALLDIR)
 endif
 endif
 endif
 endif
 
 
@@ -666,10 +667,15 @@ libinstall: staticlibinstall sharedlibinstall
 #####################################################################
 #####################################################################
 
 
 clean:
 clean:
-	-$(DEL) *$(OEXT) *$(ASMEXT) *$(PPUEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) $(PPAS) link.res log
+	-$(DEL) $(UNITOFILES) $(UNITFILES) $(PPAS) link.res log
+ifeq ($(SMARTLINK),YES)
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DELTREE) *$(SMARTEXT)
+endif
 ifdef EXEOBJECTS
 ifdef EXEOBJECTS
-	-$(DEL) $(EXEFILES)
+	-$(DEL) $(EXEFILES) $(EXEOFILES)
+endif
+ifdef EXTRACLEAN
+	-$(DEL) $(EXTRACLEAN)
 endif
 endif