Browse Source

* libname only used when libtype is set or smartlink

peter 26 years ago
parent
commit
a0902ea0ba
1 changed files with 8 additions and 4 deletions
  1. 8 4
      base/makefile.fpc

+ 8 - 4
base/makefile.fpc

@@ -426,21 +426,25 @@ ifeq ($(LIBTYPE),shared)
 override SMARTLINK=NO
 else
 override PPOPT+=-Cx
+ifneq ($(LIBNAME),)
+override PPOPT+=-o$(LIBNAME)
+endif
 endif
 endif
 
 # Add library type, for static libraries smartlinking is automatic used
 ifeq ($(LIBTYPE),shared)
 override PPOPT+=-CD
+ifneq ($(LIBNAME),)
+override PPOPT+=-o$(LIBNAME)
+endif
 else
 ifeq ($(LIBTYPE),static)
 override PPOPT+=-CS
+ifneq ($(LIBNAME),)
+override PPOPT+=-o$(LIBNAME)
 endif
 endif
-
-# Add library name
-ifneq ($(LIBNAME),)
-override PPOPT:=$(PPOPT) -o$(LIBNAME)
 endif
 
 # Add defines from PPOPTDEF to PPOPT