gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* openapp.in: Added working Java application support

Browse source 
* rules.make: Likewise, and general Java changes.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5119 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Lyndon Tremblay 1999-11-02 12:39:50 +00:00
parent 82e0ae824b
commit f35470b8ab
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openapp.in
View file

@ -168,6 +168,9 @@ if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
IFS=" "
$full_appname/$appname $@
elif [ -d $full_appname/Java ]; then
# It's a Java app
$full_appname/$appname $@
else
# Determine if the application has a binary for this operating system
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then

17
rules.make
View file

@ -170,11 +170,8 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.c
$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
$(CC) -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@ $<
Java/%.class : %.java
@(if [ ! -x Java ]; then \
$(MKDIRS) Java; \
fi)
$(JAVAC) $(ALL_JAVAFLAGS) $< && (mv $(<:.java=.class) $@)
$(JAVA_OBJ_PREFIX)%.class : $(JAVA_OBJ_PREFIX) %.java
$(JAVAC) $(ALL_JAVAFLAGS) $< -d $(JAVA_OBJ_PREFIX)
%.c : %.psw
pswrap -h $*.h -o $@ $<
@ -243,6 +240,10 @@ Java/%.class : %.java
#
# The list of PSWRAP source files to be compiled
# are in the PSWRAP_FILES variable.
#
# The list of JAVA source files to be compiled
# are in the JAVA_FILES variable.
#
ifneq ($(SUBPROJECTS),)
SUBPROJECT_OBJ_FILES = $(foreach d, $(SUBPROJECTS), \
@ -253,7 +254,11 @@ OBJC_OBJS = $(OBJC_FILES:.m=${OEXT})
OBJC_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(OBJC_OBJS))
JAVA_OBJS = $(JAVA_FILES:.java=.class)
JAVA_OBJ_FILES = $(addprefix Java/,$(JAVA_OBJS))
ifeq ($(JAVA_OBJ_PREFIX),)
JAVA_OBJ_FILES = $(JAVA_OBJS)
else
JAVA_OBJ_FILES = $(addprefix $(JAVA_OBJ_PREFIX),$(JAVA_OBJS))
endif
PSWRAP_C_FILES = $(PSWRAP_FILES:.psw=.c)
PSWRAP_H_FILES = $(PSWRAP_FILES:.psw=.h)