Changeset 265 for trunk/libjdkmidi/trunk

Timestamp:

01/20/07 14:21:05 (22 months ago)

Author:

jeffk@…

Message:

GNUmakefile is now used everywhere since all the makefiles are gnumake specific

Location:

trunk/libjdkmidi/trunk

Files:

• GNUmakefile (moved) (moved from trunk/libjdkmidi/trunk/Makefile) (2 diffs)
• configure (modified) (4 diffs)

trunk/libjdkmidi/trunk/GNUmakefile

@@ -5 +5 @@
 BUILDDIR=tmp
 
-all : $(BUILDDIR)/Makefile
+all : $(BUILDDIR)/GNUmakefile
    cd $(BUILDDIR) && $(MAKE) 
 
-clean : $(BUILDDIR)/Makefile
+clean : $(BUILDDIR)/GNUmakefile
    cd $(BUILDDIR) && $(MAKE) && $(MAKE) clean
 
-test : $(BUILDDIR)/Makefile
+test : $(BUILDDIR)/GNUmakefile
    cd $(BUILDDIR) && $(MAKE) && $(MAKE) test
 
-docs : $(BUILDDIR)/Makefile
+docs : $(BUILDDIR)/GNUmakefile
    cd $(BUILDDIR) && $(MAKE) && $(MAKE) docs
 
-asm : $(BUILDDIR)/Makefile
+asm : $(BUILDDIR)/GNUmakefile
    cd $(BUILDDIR) && $(MAKE) && $(MAKE) asm
 
@@ -23 +23 @@
    -mkdir $(BUILDDIR)
 
-.PHONY : $(BUILDDIR)/Makefile
+.PHONY : $(BUILDDIR)/GNUmakefile
 
-$(BUILDDIR)/Makefile : $(BUILDDIR)
+$(BUILDDIR)/GNUmakefile : $(BUILDDIR)
    (cd $(BUILDDIR) && ../configure $(CONFIGURE_FLAGS) )
 

trunk/libjdkmidi/trunk/configure

@@ -64 +64 @@
     echo "without the --prefix option, the system defaults to $PWD/install - not /usr/local like gnu autoconf would"
     echo ""
-    echo "After running the configure stage, a Makefile will be created for you to run with gnu make"
+    echo "After running the configure stage, a GNUmakefile will be created for you to run with gnu make"
     exit 1
 fi
@@ -81 +81 @@
 # A bunch of variables have default values but can be overriden by the command line
 # at the end of this script, all variables with the "magic_" prefix are outputted to the 
-# Makefile and the vars.sh  in the appropriate format. The script file './reconfigure' is created 
+# GNUmakefile and the vars.sh  in the appropriate format. The script file './reconfigure' is created 
 # with the current command line parameters
 #
@@ -217 +217 @@
 
 
-# extract all environment vars with the "magic_" prefix and save them in vars.sh and Makefile in the appropriate form:
+# extract all environment vars with the "magic_" prefix and save them in vars.sh and GNUmakefile in the appropriate form:
 set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=\"" substr($0,i+1) "\"" }' >vars.sh
 echo ". \"${magic_PROJECT_TOP_DIR}/project.sh\"" >>vars.sh
-set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=" substr($0,i+1) "" }' >Makefile
-
-echo 'include $(CONFIGURE_DIR)/project.mak' >>Makefile
-echo 'include $(CONFIGURE_DIR)/magic.mak' >>Makefile
+set | grep '^magic_' | sed "s/'//g" | awk '{ i = index($0,"="); print substr($0,7,i-7) "=" substr($0,i+1) "" }' >GNUmakefile
+
+echo 'include $(CONFIGURE_DIR)/project.mak' >>GNUmakefile
+echo 'include $(CONFIGURE_DIR)/magic.mak' >>GNUmakefile
 
 if [ -f ./reconfigure ]; then
@@ -236 +236 @@
 chmod +x ./reconfigure
 
-echo "./Makefile  ./vars.sh  and ./reconfigure created."
+echo "./GNUmakefile  ./vars.sh  and ./reconfigure created."
 echo "Now you may do:"
 echo "  make compile_info"