Updated definition of PRINCIPAL_CLASS now that Master/rules.make no longer

passes it down


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12903 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-02-28 18:30:07 +00:00
parent e0ca8292fd
commit 05af1134ee
7 changed files with 23 additions and 5 deletions

View file

@ -133,8 +133,10 @@ internal-application-build-template:
endif
endif
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
override PRINCIPAL_CLASS = NSApplication
PRINCIPAL_CLASS = NSApplication
endif
APPLICATION_ICON = $($(GNUSTEP_INSTANCE)_APPLICATION_ICON)

View file

@ -135,8 +135,10 @@ $(BUNDLE_FILE) : $(OBJ_FILES_TO_LINK)
endif # WITH_DLL
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
override PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
endif
# MacOSX bundles

View file

@ -378,8 +378,10 @@ framework-localized-webresource-files:: framework-webresource-dir
done
endif
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
override PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
endif
# MacOSX-S frameworks

View file

@ -278,6 +278,12 @@ ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
done
endif
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
endif
HAS_GSWCOMPONENTS = $($(GNUSTEP_INSTANCE)_HAS_GSWCOMPONENTS)
GSWAPP_INFO_PLIST = $($(GNUSTEP_INSTANCE)_GSWAPP_INFO_PLIST)

View file

@ -226,8 +226,10 @@ ifneq ($(strip $(LOCALIZED_WEBSERVER_RESOURCE_FILES)),)
done)
endif
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
override PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
endif
$(GSWBUNDLE_DIR_NAME)/bundle-info.plist: $(GSWBUNDLE_DIR_NAME)

View file

@ -55,6 +55,8 @@ internal-java_tool-all:: before-$(GNUSTEP_INSTANCE)-all \
internal-java_tool-install:: shared-instance-java-install \
$(JAVA_TOOL_INSTALLATION_DIR)/$(GNUSTEP_INSTANCE)
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
$(warning You must specify PRINCIPAL_CLASS)
# But then, we are good, and try guessing

View file

@ -95,8 +95,10 @@ ifneq ($(strip $(RESOURCE_FILES)),)
done
endif
PRINCIPAL_CLASS = $(strip $($(GNUSTEP_INSTANCE)_PRINCIPAL_CLASS))
ifeq ($(PRINCIPAL_CLASS),)
override PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
PRINCIPAL_CLASS = $(GNUSTEP_INSTANCE)
endif
PALETTE_ICON = $($(GNUSTEP_INSTANCE)_PALETTE_ICON)