mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 13:50:47 +00:00
This commit was manufactured by cvs2svn to create tag
'release-0_6_6'. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/tags/release-0_6_6@7179 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
GNUstep Maintainer
parent
2ec95f23d8
commit
2d28c93f61
10 changed files with 202 additions and 56 deletions
60
ChangeLog
60
ChangeLog
|
|
@ -1,3 +1,63 @@
|
|||
2000-08-06 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version 0.6.6 released.
|
||||
|
||||
2000-08-02 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUstep.sh.in: Add GNUSTEP_NETWORK_ROOT back into prefix list.
|
||||
* GNUstep.csh.in: Likewise. (patches from Jeff Teunissen
|
||||
<deek@dusknet.dhs.org>).
|
||||
|
||||
Sat Jul 29 22:49:23 2000 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* rules.make: Added again rule for APPLICATION_ICON which had
|
||||
been lost.
|
||||
|
||||
Fri Jul 28 14:45:21 2000 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* jni.make: New file to be included when compiling JNI projects.
|
||||
* GNUmakefile.in (MAKE_FILES): Added jni.make.
|
||||
|
||||
Fri Jul 28 12:17:02 2000 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* common.make: Set INTERNAL_JAVACFLAGS and INTERNAL_JAVAHFLAGS to
|
||||
specify classpath adding ./ at the beginning.
|
||||
* rules.make: Changed ALL_JAVAFLAGS to ALL_JAVACFLAGS.
|
||||
|
||||
Thu Jul 27 18:03:34 2000 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* common.make (JAVA_HOME): Set JAVA_HOME if not set, guessing if
|
||||
appropriate; set JAVAC and JAVAH from JAVA_HOME if needed.
|
||||
|
||||
Tue Jul 25 15:01:43 2000 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
Added support to build jni headers from java classes.
|
||||
* rules.make: Added rules to build jni headers from java classes
|
||||
using JAVAH; added JAVA_JNI_OBJ_FILES, JAVA_JNI_OBJS; added
|
||||
ALL_JAVAHFLAGS.
|
||||
* java.make (internal-java_package-all): Build also JAVA_JNI_FILES
|
||||
(internal-java_package-clean): Remove the jni headers too.
|
||||
|
||||
2000-07-21 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* GNUmakefile.in: Use C version of which_lib exclusively.
|
||||
|
||||
2000-07-18 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* ctool.make: Changed installation dir to be CTOOL_INSTALLATION_DIR
|
||||
and fixed it to install above the objc library based directory.
|
||||
|
||||
2000-07-16 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* palette.make (PALETTE_INSTALL_DIR): Default to GNUSTEP_PALETTES
|
||||
if not set.
|
||||
|
||||
* GNUmakefile.in: Use C version of which_lib exclusively.
|
||||
|
||||
2000-07-14 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* common.make (GNUSTEP_HEADERS_GUI_FLAG): Remove.
|
||||
|
||||
2000-06-30 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUstep.sh.in: Add .../${LIBRARY_COMBO} dir back into path (for
|
||||
|
|
|
|||
|
|
@ -57,25 +57,16 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
PERL = @PERL@
|
||||
|
||||
MAKE_FILES = aggregate.make application.make bundle.make service.make \
|
||||
common.make brain.make java.make library.make rules.make target.make \
|
||||
tool.make ctool.make test-library.make names.make objc.make \
|
||||
test-application.make test-tool.make subproject.make \
|
||||
common.make brain.make java.make jni.make library.make rules.make \
|
||||
target.make tool.make ctool.make test-library.make names.make \
|
||||
objc.make test-application.make test-tool.make subproject.make \
|
||||
palette.make gswapp.make gswbundle.make woapp.make wobundle.make \
|
||||
documentation.make MediaBook.func executable.template
|
||||
|
||||
all: generated-files which_lib$(EXEEXT)
|
||||
|
||||
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
|
||||
PERL=none
|
||||
endif
|
||||
ifeq ($(PERL),none)
|
||||
which_lib$(EXEEXT): which_lib.c
|
||||
$(CC) @CFLAGS@ -Wall -o $@ $^
|
||||
else
|
||||
which_lib$(EXEEXT): which_lib.pl
|
||||
cp which_lib.pl which_lib$(EXEEXT)
|
||||
chmod +x which_lib$(EXEEXT)
|
||||
endif
|
||||
|
||||
install: all
|
||||
$(srcdir)/mkinstalldirs $(prefix) $(makedir) \
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ if ( ! ${?LIBRARY_COMBO} ) then
|
|||
endif
|
||||
|
||||
setenv GNUSTEP_LOCAL_ROOT "${GNUSTEP_ROOT}/Local"
|
||||
setenv GNUSTEP_NETWORK_ROOT
|
||||
setenv GNUSTEP_NETWORK_ROOT "${GNUSTEP_ROOT}/Network"
|
||||
setenv GNUSTEP_USER_ROOT ~/GNUstep
|
||||
|
||||
if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
|
||||
|
|
@ -69,7 +69,7 @@ if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
|
|||
#
|
||||
if ( ! ${?GNUSTEP_PATHPREFIX} ) then
|
||||
setenv GNUSTEP_PATHPREFIX \
|
||||
${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_SYSTEM_ROOT}
|
||||
${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT}
|
||||
endif
|
||||
|
||||
set tp = ""
|
||||
|
|
@ -102,7 +102,7 @@ endif # ( "${GNUSTEP_BUILD_ROOT}" == "" )
|
|||
#
|
||||
#
|
||||
#
|
||||
set gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
|
||||
set gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_NETWORK_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
|
||||
|
||||
if ( ! ${?CLASSPATH} ) then
|
||||
setenv CLASSPATH "${gnustep_class_path}"
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ if [ -z "$GNUSTEP_BUILD_ROOT" ]; then
|
|||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
||||
GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_SYSTEM_ROOT
|
||||
GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_NETWORK_ROOT:$GNUSTEP_SYSTEM_ROOT
|
||||
export GNUSTEP_PATHPREFIX_LIST
|
||||
fi
|
||||
tmp_IFS="$IFS"
|
||||
|
|
@ -115,7 +115,7 @@ fi
|
|||
|
||||
fi # [ -z "$GNUSTEP_BUILD_ROOT" ]
|
||||
|
||||
gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
|
||||
gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
|
||||
|
||||
if [ -z "$CLASSPATH" ]; then
|
||||
CLASSPATH="$gnustep_class_path"
|
||||
|
|
|
|||
52
common.make
52
common.make
|
|
@ -213,25 +213,6 @@ GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUST
|
|||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)
|
||||
endif
|
||||
|
||||
#
|
||||
# Determine AppKit header subdirectory based upon library combo
|
||||
#
|
||||
ifeq ($(GUI_LIB),gnu)
|
||||
GNUSTEP_GUI_DIR = gnustep/gui
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_LIB),nx)
|
||||
GNUSTEP_GUI_DIR =
|
||||
#GNUSTEP_HEADERS_GUI_FLAG = -framework AppKit
|
||||
endif
|
||||
|
||||
#
|
||||
# Overridable compilation flags
|
||||
#
|
||||
|
|
@ -355,19 +336,42 @@ GNUSTEP_DVIPS_FLAGS =
|
|||
SUBPROJECT_PRODUCT = subproject$(OEXT)
|
||||
|
||||
#
|
||||
# The Java Compiler. Override this by setting the JAVAC environment variable
|
||||
# Set JAVA_HOME if not set.
|
||||
#
|
||||
ifeq ($(JAVAC),)
|
||||
JAVAC = javac
|
||||
ifeq ($(JAVA_HOME),)
|
||||
# Else, try JDK_HOME
|
||||
ifeq ($(JDK_HOME),)
|
||||
# Else, try by finding the path of javac and removing 'bin/javac' from it
|
||||
ifeq ($(JAVAC),)
|
||||
JAVA_HOME = $(shell which javac | sed "s/bin\/javac//g")
|
||||
else # $(JAVAC) != ""
|
||||
JAVA_HOME = $(shell which $(JAVAC) | sed "s/bin\/javac//g")
|
||||
endif
|
||||
else # $(JDK_HOME) != ""
|
||||
JAVA_HOME = $(JDK_HOME)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# The Java Header Compiler.
|
||||
# The Java Compiler.
|
||||
#
|
||||
ifeq ($(JAVAC),)
|
||||
JAVAC = $(JAVA_HOME)/bin/javac
|
||||
endif
|
||||
|
||||
#
|
||||
# The Java Header Compiler.
|
||||
#
|
||||
ifeq ($(JAVAH),)
|
||||
JAVAH = javah
|
||||
JAVAH = $(JAVA_HOME)/bin/javah
|
||||
endif
|
||||
|
||||
#
|
||||
# Flags useful for compilation
|
||||
#
|
||||
INTERNAL_JAVACFLAGS = -classpath ./:$(CLASSPATH)
|
||||
INTERNAL_JAVAHFLAGS = -classpath ./:$(CLASSPATH)
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
12
ctool.make
12
ctool.make
|
|
@ -38,9 +38,9 @@ include $(GNUSTEP_MAKEFILES)/rules.make
|
|||
|
||||
# This is the directory where the ctools get installed. If you don't specify a
|
||||
# directory they will get installed in the GNUstep system root.
|
||||
ifeq ($(TOOL_INSTALLATION_DIR),)
|
||||
TOOL_INSTALLATION_DIR = \
|
||||
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
|
||||
ifeq ($(CTOOL_INSTALLATION_DIR),)
|
||||
CTOOL_INSTALLATION_DIR = \
|
||||
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
|
||||
ifeq ($(INTERNAL_ctool_NAME),)
|
||||
|
|
@ -105,16 +105,16 @@ after-$(TARGET)-all::
|
|||
internal-ctool-install:: internal-ctool-all internal-install-dirs install-ctool
|
||||
|
||||
internal-install-dirs::
|
||||
$(MKDIRS) $(TOOL_INSTALLATION_DIR)
|
||||
$(MKDIRS) $(CTOOL_INSTALLATION_DIR)
|
||||
|
||||
install-ctool::
|
||||
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT) \
|
||||
$(TOOL_INSTALLATION_DIR);
|
||||
$(CTOOL_INSTALLATION_DIR);
|
||||
cp $(GNUSTEP_MAKEFILES)/executable.template $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_ctool_NAME)
|
||||
chmod a+x $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_ctool_NAME)
|
||||
|
||||
internal-ctool-uninstall::
|
||||
rm -f $(TOOL_INSTALLATION_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT)
|
||||
rm -f $(CTOOL_INSTALLATION_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT)
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
|
|
|
|||
10
java.make
10
java.make
|
|
@ -42,6 +42,13 @@ JAVA_PACKAGE_MAKE_LOADED=yes
|
|||
# with a different relative path, you may use JAVA_PACKAGE_PREFIX:
|
||||
# They will be installed in:
|
||||
# ${GNUSTEP_INSTALLATION_DIR}/Libraries/Java/${JAVA_PACKAGE_PREFIX}/{relative path}
|
||||
#
|
||||
# If you have java sources to be processed throught JAVAH to create JNI
|
||||
# headers, specify the files in xxx_JAVA_JNI_FILES. The headers will be
|
||||
# placed together with the source file (example: the header of
|
||||
# gnu/gnustep/base/NSObject.java will be created as gnu/gnustep/base/NSObject.h)
|
||||
# These headers are not installed.
|
||||
#
|
||||
|
||||
JAVA_PACKAGE_NAME:=$(strip $(JAVA_PACKAGE_NAME))
|
||||
|
||||
|
|
@ -73,7 +80,7 @@ else
|
|||
# Targets
|
||||
#
|
||||
internal-java_package-all:: before-$(TARGET)-all \
|
||||
$(JAVA_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
$(JAVA_OBJ_FILES) $(JAVA_JNI_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
|
||||
after-$(TARGET)-all
|
||||
|
||||
before-$(TARGET)-all::
|
||||
|
|
@ -103,6 +110,7 @@ install-java_package:: internal-install-java-dirs
|
|||
#
|
||||
internal-java_package-clean::
|
||||
rm -f $(JAVA_OBJ_FILES)
|
||||
rm -f $(JAVA_JNI_OBJ_FILES)
|
||||
|
||||
internal-java_package-distclean::
|
||||
|
||||
|
|
|
|||
59
jni.make
Normal file
59
jni.make
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
#
|
||||
# jni.make
|
||||
#
|
||||
# Makefile to include to compile JNI code.
|
||||
#
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Nicola Pero <nicola@brainstorm.co.uk>
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#
|
||||
# Include this file if you need to compile JNI code.
|
||||
# This files simply adds automatically the compiler flags to find the
|
||||
# jni headers.
|
||||
#
|
||||
|
||||
# prevent multiple inclusions
|
||||
ifeq ($(JNI_MAKE_LOADED),)
|
||||
JNI_MAKE_LOADED=yes
|
||||
|
||||
# Default
|
||||
JAVA_OS = linux
|
||||
|
||||
# Solaris
|
||||
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
|
||||
JAVA_OS = solaris
|
||||
endif
|
||||
|
||||
# Windows
|
||||
ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
|
||||
JAVA_OS = win32
|
||||
endif
|
||||
|
||||
# Add more platforms here
|
||||
|
||||
#
|
||||
# This should be where your jni.h and jni_md.h are located.
|
||||
#
|
||||
JNI_INCLUDE_HEADERS = -I$(JAVA_HOME)/include/ \
|
||||
-I$(JAVA_HOME)/include/$(JAVA_OS)
|
||||
|
||||
ADDITIONAL_INCLUDE_DIRS += $(JNI_INCLUDE_HEADERS)
|
||||
|
||||
endif # jni.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
13
palette.make
13
palette.make
|
|
@ -123,6 +123,11 @@ ifeq ($(PALETTE_ICON),)
|
|||
override PALETTE_ICON = $(INTERNAL_palette_NAME)
|
||||
endif
|
||||
|
||||
ifeq ($(PALETTE_INSTALL_DIR),)
|
||||
PALETTE_INSTALL_DIR := $(GNUSTEP_PALETTES)
|
||||
endif
|
||||
|
||||
|
||||
$(PALETTE_DIR_NAME)/Resources/Info-gnustep.plist: $(PALETTE_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = \"$(INTERNAL_palette_NAME)\";"; \
|
||||
|
|
@ -146,16 +151,16 @@ $(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources
|
|||
) >$@
|
||||
|
||||
internal-palette-install:: internal-install-dirs
|
||||
tar cf - $(PALETTE_DIR_NAME) | (cd $(GNUSTEP_PALETTES); tar xf -)
|
||||
tar cf - $(PALETTE_DIR_NAME) | (cd $(PALETTE_INSTALL_DIR); tar xf -)
|
||||
|
||||
internal-install-dirs::
|
||||
$(MKDIRS) $(GNUSTEP_PALETTES)
|
||||
$(MKDIRS) $(PALETTE_INSTALL_DIR)
|
||||
|
||||
$(PALETTE_DIR_NAME)/Resources $(GNUSTEP_PALETTES)::
|
||||
$(PALETTE_DIR_NAME)/Resources $(PALETTE_INSTALL_DIR)::
|
||||
@$(MKDIRS) $@
|
||||
|
||||
internal-palette-uninstall::
|
||||
rm -rf $(GNUSTEP_PALETTES)/$(PALETTE_DIR_NAME)
|
||||
rm -rf $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME)
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
|
|
|
|||
27
rules.make
27
rules.make
|
|
@ -138,8 +138,11 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
|||
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_JAVAFLAGS = $(INTERNAL_JAVAFLAGS) $(ADDITIONAL_JAVAFLAGS) \
|
||||
$(AUXILIARY_JAVAFLAGS)
|
||||
ALL_JAVACFLAGS = $(INTERNAL_JAVACFLAGS) $(ADDITIONAL_JAVACFLAGS) \
|
||||
$(AUXILIARY_JAVACFLAGS)
|
||||
|
||||
ALL_JAVAHFLAGS = $(INTERNAL_JAVAHFLAGS) $(ADDITIONAL_JAVAHFLAGS) \
|
||||
$(AUXILIARY_JAVAHFLAGS)
|
||||
|
||||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
|
||||
|
|
@ -168,7 +171,7 @@ endif
|
|||
# General rules
|
||||
VPATH = .
|
||||
|
||||
.SUFFIXES: .m .c .psw .java
|
||||
.SUFFIXES: .m .c .psw .java .h
|
||||
|
||||
.PRECIOUS: %.c %.h $(GNUSTEP_OBJ_DIR)/%${OEXT}
|
||||
|
||||
|
|
@ -179,7 +182,14 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@
|
||||
|
||||
%.class : %.java
|
||||
$(JAVAC) $(ALL_JAVAFLAGS) $<
|
||||
$(JAVAC) $(ALL_JAVACFLAGS) $<
|
||||
|
||||
# A jni header file which is created using JAVAH
|
||||
# Example of how this rule will be applied:
|
||||
# gnu/gnustep/base/NSObject.h : gnu/gnustep/base/NSObject.java
|
||||
# javah -o gnu/gnustep/base/NSObject.h gnu.gnustep.base.NSObject
|
||||
%.h : %.java
|
||||
$(JAVAH) $(ALL_JAVAHFLAGS) -o $@ $(subst /,.,$*)
|
||||
|
||||
%.c : %.psw
|
||||
pswrap -h $*.h -o $@ $<
|
||||
|
|
@ -210,6 +220,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
OBJC_FILES="$($*_OBJC_FILES)" \
|
||||
C_FILES="$($*_C_FILES)" \
|
||||
JAVA_FILES="$($*_JAVA_FILES)" \
|
||||
JAVA_JNI_FILES="$($*_JAVA_JNI_FILES)" \
|
||||
OBJ_FILES="$($*_OBJ_FILES)" \
|
||||
PSWRAP_FILES="$($*_PSWRAP_FILES)" \
|
||||
HEADER_FILES="$($*_HEADER_FILES)" \
|
||||
|
|
@ -231,6 +242,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
|
||||
BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
|
||||
SERVICE_INSTALL_DIR="$($*_SERVICE_INSTALL_DIR)" \
|
||||
APPLICATION_ICON="$($*_APPLICATION_ICON)" \
|
||||
PALETTE_ICON="$($*_PALETTE_ICON)" \
|
||||
PRINCIPAL_CLASS="$($*_PRINCIPAL_CLASS)" \
|
||||
DLL_DEF="$($*_DLL_DEF)" \
|
||||
|
|
@ -265,6 +277,10 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
# The list of JAVA source files to be compiled
|
||||
# are in the JAVA_FILES variable.
|
||||
#
|
||||
# The list of JAVA source files from which to generate jni headers
|
||||
# are in the JAVA_JNI_FILES variable.
|
||||
#
|
||||
|
||||
|
||||
ifneq ($($*_SUBPROJECTS),)
|
||||
SUBPROJECT_OBJ_FILES = $(foreach d, $($*_SUBPROJECTS), \
|
||||
|
|
@ -287,6 +303,9 @@ OBJC_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(OBJC_OBJS))
|
|||
JAVA_OBJS = $(JAVA_FILES:.java=.class)
|
||||
JAVA_OBJ_FILES = $(JAVA_OBJS)
|
||||
|
||||
JAVA_JNI_OBJS = $(JAVA_JNI_FILES:.java=.h)
|
||||
JAVA_JNI_OBJ_FILES = $(JAVA_JNI_OBJS)
|
||||
|
||||
PSWRAP_C_FILES = $(PSWRAP_FILES:.psw=.c)
|
||||
PSWRAP_H_FILES = $(PSWRAP_FILES:.psw=.h)
|
||||
PSWRAP_OBJS = $(PSWRAP_FILES:.psw=${OEXT})
|
||||
|
|
|
|||
Loading…
Reference in a new issue