mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Tidy a little
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5678 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
d71c85d257
commit
81381253aa
4 changed files with 10 additions and 8 deletions
|
@ -3,6 +3,8 @@ Fri Jan 7 6:05:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
|||
* application.make: use xxx_PRINCIPAL_CLASS to override the value
|
||||
of NSExecutable in Info.plist so we can have callses other than
|
||||
NSApplication as the app class.
|
||||
* palette.make: use PRINCIPAL_CLASS rather than PALETTE_CLASS
|
||||
* rules.make: remove PALETTE_CLASS
|
||||
|
||||
1999-12-09 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
|
|
|
@ -120,7 +120,7 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
|
|||
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
|
||||
echo " NSMainNibFile = \"\";"; \
|
||||
else \
|
||||
echo " NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
|
||||
echo " NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed -e 's/.gmodel//' -e 's/.gorm//' -e 's/.nib//'`\";"; \
|
||||
fi; \
|
||||
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
if [ -r "$(INTERNAL_bundle_NAME)Info.plist" ]; then \
|
||||
|
|
13
palette.make
13
palette.make
|
@ -33,7 +33,8 @@ include $(GNUSTEP_MAKEFILES)/rules.make
|
|||
# The name of the palette is in the PALETTE_NAME variable.
|
||||
# The list of palette resource file are in xxx_RESOURCE_FILES
|
||||
# The list of palette resource directories are in xxx_RESOURCE_DIRS
|
||||
# The name of the palette class is xxx_PALETTE_CLASS
|
||||
# The name of the palette class is xxx_PRINCIPAL_CLASS
|
||||
# The name of the palette nib is xxx_MAIN_MODEL_FILE
|
||||
# The name of the palette icon is xxx_PALETTE_ICON
|
||||
# The name of a file containing info.plist entries to be inserted into
|
||||
# Info-gnustep.plist (if any) is xxxInfo.plist where xxx is the palette name
|
||||
|
@ -114,8 +115,8 @@ $(PALETTE_DIR_NAME)/Resources/palette.table
|
|||
done \
|
||||
fi)
|
||||
|
||||
ifeq ($(PALETTE_CLASS),)
|
||||
override PALETTE_CLASS = $(INTERNAL_palette_NAME)
|
||||
ifeq ($(PRINCIPAL_CLASS),)
|
||||
override PRINCIPAL_CLASS = $(INTERNAL_palette_NAME)
|
||||
endif
|
||||
|
||||
ifeq ($(PALETTE_ICON),)
|
||||
|
@ -132,12 +133,12 @@ $(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist: $(PALETTE_DIR_NAME)/Resources
|
|||
|
||||
$(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources
|
||||
@(echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
if [ "$(PALETTE_NIB)" = "" ]; then \
|
||||
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
|
||||
echo " NibFile = \"\";"; \
|
||||
else \
|
||||
echo " NibFile = \"`echo $(PALETTE_NIB) | sed 's/.gmodel//'`\";"; \
|
||||
echo " NibFile = \"`echo $(MAIN_MODEL_FILE) | sed -e 's/.gmodel//' -e 's/.gorm//' -e 's/.nib//'`\";"; \
|
||||
fi; \
|
||||
echo " Class = \"$(PALETTE_CLASS)\";"; \
|
||||
echo " Class = \"$(PRINCIPAL_CLASS)\";"; \
|
||||
echo " Icon = \"$(PALETTE_ICON)\";"; \
|
||||
if [ -r "$(INTERNAL_palette_NAME)palette.table" ]; then \
|
||||
cat $(INTERNAL_palette_NAME)palette.table; \
|
||||
|
|
|
@ -215,7 +215,6 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
|
|||
RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
|
||||
BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
|
||||
PALETTE_LIBS="$($*_PALETTE_LIBS) $(PALETTE_LIBS)" \
|
||||
PALETTE_CLASS="$($*_PALETTE_CLASS)" \
|
||||
PALETTE_ICON="$($*_PALETTE_ICON)" \
|
||||
SERVICE_INSTALL_DIR="$($*_SERVICE_INSTALL_DIR)" \
|
||||
PRINCIPAL_CLASS="$($*_PRINCIPAL_CLASS)" \
|
||||
|
|
Loading…
Reference in a new issue