Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/java Makefile

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/java Makefile

Author davidp
Full name David C. Pellegrini
Date 2000-09-18 12:18:10 PDT
Message User: davidp
  Date: 00/09/18 12:18:10

  Modified: java Makefile
  Log:
  Merge changes to make otnxchange work
  
  Revision Changes Path
  1.19 +23 -12 joist/java/Makefile
  
  Index: Makefile
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/Makefile,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Makefile 2000/09/12 13:00:13 1.18
  +++ Makefile 2000/09/18 19:18:09 1.19
  @@ -1,31 +1,37 @@
   ####################​####################​####################​##########
   # -*- Makefile -*- developed for a Unix system.
   #
  -
  -
  +# $Id: Makefile,v 1.19 2000/09/18 19:18:09 davidp Exp $
  +#
  +#
   ####################​####################​####
   # DO NOT EDIT BELOW
  +#
   # Any desired configuration should be done
  -# to Makefile.config.
  +# to the adjacent Makefile.config.
   #
   
  -all: clean build props
  +all: clean build props jar
   
   include Makefile.config
   
   build: dest
  - @if [ -d $(SITE_CLASS_DIR) ]; then \
  - find org -name '*.java' | xargs $(JAVAC) $(JFLAGS) $(JIKESFLAGS); \
  - else \
  - find org -name '*.java' | xargs $(JAVAC) $(INITIAL_JFLAGS); \
  - fi
  + find org -name '*.java' | xargs $(JAVAC) $(JFLAGS) $(JIKESFLAGS)
   
   jar: makefiles build props
       @cd $(CLASS_DIR); \
       $(JAVA_AR) c0f $(JAR_FILE) org
   
   makefiles:
  - @$(SANDBOX)/scripts​/mkPkgMakefiles
  + @# Do nothing here. Doesn't seem to work.
  + @# Script fails because java subdirectories have
  + @# have checked in Makefiles that the script cannot
  + @# overwrite because originals are read-only.
  + @# Below is original rule. St.Ack
  + @#
  + @# @$(SANDBOX)/scripts​/mkPkgMakefiles
  + @#
  +
   
   dest:
       @if [ ! -d $(CLASS_DIR) ]; then mkdir -p $(CLASS_DIR); fi
  @@ -34,7 +40,7 @@
       @find org -name '*.properties' | cpio -dump $(CLASS_DIR)
   
   api: FORCE
  - @if [ ! -d $(API_DIR) ]; then mkdir $(API_DIR); fi
  + @if [ ! -d $(API_DIR) ]; then mkdir -p $(API_DIR); fi
       @$(JAVADOC) $(JAVADOC_FLAGS) @package-list > /dev/null || \
         echo "You need JDK 1.2+ to use the 'api' target"
   
  @@ -44,8 +50,13 @@
   
   install-dest:
       @if [ ! -d $(INSTALL_DIR) ]; then mkdir -p $(INSTALL_DIR); fi
  +
  +install-jar:
  + @if [ ! -d $(INSTALL_JAR_DIR) ]; then mkdir -p $(INSTALL_JAR_DIR); fi
  + @if [ ! -e $(CLASS_DIR)/$(JAR_FILE) ]; then make jar; fi
  + $(COPY) -f $(CLASS_DIR)/$(JAR_FILE) $(INSTALL_JAR_DIR)
   
  -install: install-dest
  +install: install-dest install-jar
       @rsync -ar --delete $(CLASS_DIR)/org/$(PROJECT) $(INSTALL_DIR)/org
   
   FORCE:

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/java Makefile davidp David C. Pellegrini 2000-09-18 12:18:10 PDT
Messages per page: