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

Rewritten java stuff

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6754 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2000-06-21 11:26:50 +00:00
parent 2858114975
commit 1e847c5962
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rules.make
View file

@ -7,7 +7,6 @@
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Ovidiu Predescu <ovidiu@net-community.com>
# Java support by Lyndon Tremblay <ltremblay@mezzanine.xnot.com>
#
# This file is part of the GNUstep Makefile Package.
#
@ -179,11 +178,8 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.c
$(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
$(CC) $< -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@
$(JAVA_OBJ_PREFIX)%.class : %.java
@if [ $< -nt $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ -o ! -f $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ ]; then \
echo $(JAVAC) $(ALL_JAVAFLAGS) $< -d $(JAVA_OBJ_PREFIX); \
$(JAVAC) $(ALL_JAVAFLAGS) $< -d $(JAVA_OBJ_PREFIX); \
fi
%.class : %.java
$(JAVAC) $(ALL_JAVAFLAGS) $<
%.c : %.psw
pswrap -h $*.h -o $@ $<
@ -214,8 +210,6 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
OBJC_FILES="$($*_OBJC_FILES)" \
C_FILES="$($*_C_FILES)" \
JAVA_FILES="$($*_JAVA_FILES)" \
JAVA_JOBS_FILES="$($*_JOBS_FILES)" \
JAVA_WRAPPER_FRAMEWORK="$($*_WRAPPER_FRAMEWORK)" \
OBJ_FILES="$($*_OBJ_FILES)" \
PSWRAP_FILES="$($*_PSWRAP_FILES)" \
HEADER_FILES="$($*_HEADER_FILES)" \
@ -291,11 +285,7 @@ OBJC_OBJS = $(OBJC_FILES:.m=${OEXT})
OBJC_OBJ_FILES = $(addprefix $(GNUSTEP_OBJ_DIR)/,$(OBJC_OBJS))
JAVA_OBJS = $(JAVA_FILES:.java=.class)
ifeq ($(JAVA_OBJ_PREFIX),)
JAVA_OBJ_FILES = $(JAVA_OBJS)
else
JAVA_OBJ_FILES = $(addprefix $(JAVA_OBJ_PREFIX),$(JAVA_OBJS))
endif
JAVA_OBJ_FILES = $(JAVA_OBJS)
PSWRAP_C_FILES = $(PSWRAP_FILES:.psw=.c)
PSWRAP_H_FILES = $(PSWRAP_FILES:.psw=.h)