[llvm-commits] CVS: llvm/Makefile

2007-04-15 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.71 - 1.72
---
Log message:

Add a new testing target: check-one. It is used like this:

make check-one TESTONE=test/path/to/test.ll

This runs a single check in exactly the same way that dejagnu runs it.


---
Diffs of the changes:  (+3 -0)

 Makefile |3 +++
 1 files changed, 3 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.71 llvm/Makefile:1.72
--- llvm/Makefile:1.71  Thu Mar 29 13:14:00 2007
+++ llvm/Makefile   Sun Apr 15 01:18:50 2007
@@ -113,6 +113,9 @@
 check-llvm2cpp:
$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
 
+check-one:
+   $(MAKE) -C test check-one TESTONE=$(TESTONE)
+
 srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
 



___
llvm-commits mailing list
[EMAIL PROTECTED]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2007-04-15 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.72 - 1.73
---
Log message:

Echo command lines only if the user wants them.


---
Diffs of the changes:  (+2 -2)

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.72 llvm/Makefile:1.73
--- llvm/Makefile:1.72  Sun Apr 15 01:18:50 2007
+++ llvm/Makefile   Sun Apr 15 01:22:48 2007
@@ -111,10 +111,10 @@
 endif
 
 check-llvm2cpp:
-   $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+   $(Verb)$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
 
 check-one:
-   $(MAKE) -C test check-one TESTONE=$(TESTONE)
+   $(Verb)$(MAKE) -C test check-one TESTONE=$(TESTONE)
 
 srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec



___
llvm-commits mailing list
[EMAIL PROTECTED]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2007-03-29 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.70 - 1.71
---
Log message:

don't build runtime for now, ever


---
Diffs of the changes:  (+5 -3)

 Makefile |8 +---
 1 files changed, 5 insertions(+), 3 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.70 llvm/Makefile:1.71
--- llvm/Makefile:1.70  Wed Feb 21 00:23:20 2007
+++ llvm/Makefile   Thu Mar 29 13:14:00 2007
@@ -25,10 +25,12 @@
 
 include $(LEVEL)/Makefile.config 
 
-# llvm-gcc4 doesn't need runtime libs.
-ifeq ($(LLVMGCC_MAJVERS),4)
+# llvm-gcc4 doesn't need runtime libs.  llvm-gcc4 is the only supported one.
+# FIXME: Remove runtime entirely once we have an understanding of where
+# libprofile etc should go.
+#ifeq ($(LLVMGCC_MAJVERS),4)
   DIRS := $(filter-out runtime, $(DIRS))
-endif
+#endif
 
 ifeq ($(MAKECMDGOALS),libs-only)
   DIRS := $(filter-out tools runtime docs, $(DIRS))



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2007-02-20 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.69 - 1.70
---
Log message:

revert r1.68.  This breaks 'make install' without doing 'make' first, but
fixes PR1208: http://llvm.org/PR1208 .


---
Diffs of the changes:  (+7 -0)

 Makefile |7 +++
 1 files changed, 7 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.69 llvm/Makefile:1.70
--- llvm/Makefile:1.69  Mon Feb  5 17:18:58 2007
+++ llvm/Makefile   Wed Feb 21 00:23:20 2007
@@ -40,6 +40,13 @@
   OPTIONAL_DIRS :=
 endif
 
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
+
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/Makefile

2007-02-20 Thread Reid Spencer 
On Wed, 2007-02-21 at 00:23 -0600, Chris Lattner wrote:
 
 Changes in directory llvm:
 
 Makefile updated: 1.69 - 1.70
 ---
 Log message:
 
 revert r1.68.  This breaks 'make install' without doing 'make' first, but
 fixes PR1208: http://llvm.org/PR1208 .

This isn't correct. I implemented the NO_INSTALL keyword specifically to
prevent installation of a directory's build products. This is what
utils/TableGen does. 

Please revert this patch (1.70) and edit the examples directory's
makefiles to include:

NO_INSTALL := 1

That will prevent installation of the examples while still fixing the PR
for allowing make install to build everything and install only that
which is installable.

From the makefile guide:

 NO_INSTALL
 Specifies that the build products of the directory should not
 be installed but should be built even if the install target is
 given. This is handy for directories that build libraries or
 tools that are only used as part of the build process, such as
 code generators (e.g. tblgen).

Thanks,

Reid.

 
 
 ---
 Diffs of the changes:  (+7 -0)
 
  Makefile |7 +++
  1 files changed, 7 insertions(+)
 
 
 Index: llvm/Makefile
 diff -u llvm/Makefile:1.69 llvm/Makefile:1.70
 --- llvm/Makefile:1.69Mon Feb  5 17:18:58 2007
 +++ llvm/Makefile Wed Feb 21 00:23:20 2007
 @@ -40,6 +40,13 @@
OPTIONAL_DIRS :=
  endif
  
 +# Don't install utils, examples, or projects they are only used to 
 +# build LLVM.
 +ifeq ($(MAKECMDGOALS),install)
 +  DIRS := $(filter-out utils, $(DIRS))
 +  OPTIONAL_DIRS :=
 +endif
 +
  # Include the main makefile machinery.
  include $(LLVM_SRC_ROOT)/Makefile.rules
  
 
 
 
 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/Makefile

2007-02-20 Thread Chris Lattner 
 revert r1.68.  This breaks 'make install' without doing 'make'  
 first, but
 fixes PR1208: http://llvm.org/PR1208 .

 This isn't correct.

I'm aware of that, which is why I mentioned that in the commit  
message.  I'm just repairing the regression by reverting the  
offending patch: if you'd like to refix make install without doing a  
make first (without reintroducing the regression) go for it!

-Chris


___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/Makefile

2007-02-20 Thread Reid Spencer 
On Tue, 2007-02-20 at 23:23 -0800, Chris Lattner wrote:
  revert r1.68.  This breaks 'make install' without doing 'make'  
  first, but
  fixes PR1208: http://llvm.org/PR1208 .
 
  This isn't correct.
 
 I'm aware of that, which is why I mentioned that in the commit  
 message.  I'm just repairing the regression by reverting the  
 offending patch: if you'd like to refix make install without doing a  
 make first (without reintroducing the regression) go for it!

I just explained exactly how.

 
 -Chris
 
 

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2007-02-05 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.67 - 1.68
---
Log message:

Don't prevent install target from descending into the utils directory.
It prevents make install on a clean directory from working.


---
Diffs of the changes:  (+0 -7)

 Makefile |7 ---
 1 files changed, 7 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.67 llvm/Makefile:1.68
--- llvm/Makefile:1.67  Thu Nov 16 21:32:33 2006
+++ llvm/Makefile   Mon Feb  5 03:43:17 2007
@@ -40,13 +40,6 @@
   OPTIONAL_DIRS :=
 endif
 
-# Don't install utils, examples, or projects they are only used to 
-# build LLVM.
-ifeq ($(MAKECMDGOALS),install)
-  DIRS := $(filter-out utils, $(DIRS))
-  OPTIONAL_DIRS :=
-endif
-
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/Makefile

2007-02-05 Thread Chris Lattner 
 Don't prevent install target from descending into the utils directory.
 It prevents make install on a clean directory from working.

Does this change what gets installed into PREFIX?

-Chris


 ---
 Diffs of the changes:  (+0 -7)

  Makefile |7 ---
  1 files changed, 7 deletions(-)


 Index: llvm/Makefile
 diff -u llvm/Makefile:1.67 llvm/Makefile:1.68
 --- llvm/Makefile:1.67Thu Nov 16 21:32:33 2006
 +++ llvm/Makefile Mon Feb  5 03:43:17 2007
 @@ -40,13 +40,6 @@
OPTIONAL_DIRS :=
  endif

 -# Don't install utils, examples, or projects they are only used to
 -# build LLVM.
 -ifeq ($(MAKECMDGOALS),install)
 -  DIRS := $(filter-out utils, $(DIRS))
 -  OPTIONAL_DIRS :=
 -endif
 -
  # Include the main makefile machinery.
  include $(LLVM_SRC_ROOT)/Makefile.rules




 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Re: [llvm-commits] CVS: llvm/Makefile

2007-02-05 Thread Reid Spencer 
On Mon, 2007-02-05 at 10:27 -0800, Chris Lattner wrote:
  Don't prevent install target from descending into the utils directory.
  It prevents make install on a clean directory from working.
 
 Does this change what gets installed into PREFIX?

Perhaps. It might cause tblgen to be installed when previously it
wasn't.  Thing is, make install must be able to build everything from
scratch and it currently doesn't. If we don't want tblgen installed then
we need to modify the llvm/utils/TableGen/Makefile not completely avoid
descending into utils from llvm/Makefile.

 
 -Chris
 
 
  ---
  Diffs of the changes:  (+0 -7)
 
   Makefile |7 ---
   1 files changed, 7 deletions(-)
 
 
  Index: llvm/Makefile
  diff -u llvm/Makefile:1.67 llvm/Makefile:1.68
  --- llvm/Makefile:1.67  Thu Nov 16 21:32:33 2006
  +++ llvm/Makefile   Mon Feb  5 03:43:17 2007
  @@ -40,13 +40,6 @@
 OPTIONAL_DIRS :=
   endif
 
  -# Don't install utils, examples, or projects they are only used to
  -# build LLVM.
  -ifeq ($(MAKECMDGOALS),install)
  -  DIRS := $(filter-out utils, $(DIRS))
  -  OPTIONAL_DIRS :=
  -endif
  -
   # Include the main makefile machinery.
   include $(LLVM_SRC_ROOT)/Makefile.rules
 
 
 
 
  ___
  llvm-commits mailing list
  llvm-commits@cs.uiuc.edu
  http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
 
 ___
 llvm-commits mailing list
 llvm-commits@cs.uiuc.edu
 http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2007-02-05 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.68 - 1.69
---
Log message:

Add a show-footprint target to run du a few times to show how much disk
space a build tree's objects are consuming.


---
Diffs of the changes:  (+6 -0)

 Makefile |6 ++
 1 files changed, 6 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.68 llvm/Makefile:1.69
--- llvm/Makefile:1.68  Mon Feb  5 03:43:17 2007
+++ llvm/Makefile   Mon Feb  5 17:18:58 2007
@@ -110,4 +110,10 @@
 rpm: $(LLVM_OBJ_ROOT)/llvm.spec 
rpmbuild -bb --target $(TARGET_TRIPLE) $(LLVM_OBJ_ROOT)/llvm.spec
 
+show-footprint:
+   $(Verb) du -sk $(LibDir)
+   $(Verb) du -sk $(ToolDir)
+   $(Verb) du -sk $(ExmplDir)
+   $(Verb) du -sk $(ObjDir)
+
 .PHONY: srpm rpm



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile Makefile.config.in Makefile.rules configure

2006-11-16 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.65 - 1.66
Makefile.config.in updated: 1.66 - 1.67
Makefile.rules updated: 1.410 - 1.411
configure updated: 1.255 - 1.256
---
Log message:

In LLVM 2.0 we won't use the runtime libraries as llvm-gcc3 support will
be dropped. This patch pertains to removing the runtime directory from LLVM.


---
Diffs of the changes:  (+34 -80)

 Makefile   |   13 ++-
 Makefile.config.in |5 ---
 Makefile.rules |8 
 configure  |   88 ++---
 4 files changed, 34 insertions(+), 80 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.65 llvm/Makefile:1.66
--- llvm/Makefile:1.65  Sun Sep  3 23:27:07 2006
+++ llvm/Makefile   Thu Nov 16 17:17:26 2006
@@ -15,28 +15,23 @@
 #   3. Build VMCore, which builds the Intrinsics.inc file used by libs.
 #   4. Build libs, which are needed by llvm-config.
 #   5. Build llvm-config, which determines inter-lib dependencies for tools.
-#   6. Build tools, runtime, docs.
+#   6. Build tools, docs.
 #
 DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
-tools runtime docs
+tools docs
 
 OPTIONAL_DIRS := examples projects
 EXTRA_DIST := test llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config 
 
-# llvm-gcc4 doesn't need runtime libs.
-ifeq ($(LLVMGCC_MAJVERS),4)
-  DIRS := $(filter-out runtime, $(DIRS))
-endif
-
 ifeq ($(MAKECMDGOALS),libs-only)
-  DIRS := $(filter-out tools runtime docs, $(DIRS))
+  DIRS := $(filter-out tools docs, $(DIRS))
   OPTIONAL_DIRS :=
 endif
 
 ifeq ($(MAKECMDGOALS),tools-only)
-  DIRS := $(filter-out runtime docs, $(DIRS))
+  DIRS := $(filter-out docs, $(DIRS))
   OPTIONAL_DIRS :=
 endif
 


Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.66 llvm/Makefile.config.in:1.67
--- llvm/Makefile.config.in:1.66Sun Nov  5 14:10:16 2006
+++ llvm/Makefile.config.in Thu Nov 16 17:17:26 2006
@@ -207,11 +207,6 @@
 #DISABLE_ASSERTIONS = 1
 @DISABLE_ASSERTIONS@
 
-# When DEBUG_RUNTIME is enabled, the runtime libraries will retain debug
-# symbols.
-#DEBUG_RUNTIME = 1
[EMAIL PROTECTED]@
-
 # When ENABLE_PROFILING is enabled, the llvm source base is built with profile
 # information to allow gprof to be used to get execution frequencies.
 #ENABLE_PROFILING = 1


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.410 llvm/Makefile.rules:1.411
--- llvm/Makefile.rules:1.410   Wed Nov 15 15:04:15 2006
+++ llvm/Makefile.rules Thu Nov 16 17:17:26 2006
@@ -1099,18 +1099,10 @@
$(Echo) Compiling $*.c to asm for $(BuildMode) build $(PIC_FLAG)
$(MAYBE_PIC_Compile.C) $ -o $@ -S
 
-
 # make the C and C++ compilers strip debug info out of bytecode libraries.
-ifdef DEBUG_RUNTIME
-$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
-   $(Echo) Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)
-   $(Verb) $(GCCAS) $ -o $@
-else
 $(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
$(Echo) Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)
$(Verb) $(GCCAS) -strip-debug $ -o $@
-endif
-
 
 #-
 # Provide rule to build .bc files from .ll sources,


Index: llvm/configure
diff -u llvm/configure:1.255 llvm/configure:1.256
--- llvm/configure:1.255Mon Nov 13 18:59:52 2006
+++ llvm/configure  Thu Nov 16 17:17:26 2006
@@ -830,7 +830,6 @@
 CVSBUILD
 ENABLE_OPTIMIZED
 DISABLE_ASSERTIONS
-DEBUG_RUNTIME
 JIT
 TARGET_HAS_JIT
 ENABLE_DOXYGEN
@@ -1520,7 +1519,6 @@
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-optimized
   --enable-assertions
-  --enable-debug-runtime
   --enable-jitEnable Just In Time Compiling (default is YES)
   --enable-doxygenBuild doxygen documentation (default is NO)
   --enable-threadsUse threads if available (default is YES)
@@ -4563,21 +4561,6 @@
 
 fi
 
-# Check whether --enable-debug-runtime was given.
-if test ${enable_debug_runtime+set} = set; then
-  enableval=$enable_debug_runtime;
-else
-  enableval=no
-fi
-
-if test ${enableval} = no ; then
-  DEBUG_RUNTIME=
-
-else
-  DEBUG_RUNTIME=DEBUG_RUNTIME=1
-
-fi
-
 # Check whether --enable-jit was given.
 if test ${enable_jit+set} = set; then
   enableval=$enable_jit;
@@ -10298,7 +10281,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat  conftest.$ac_ext EOF
-#line 10301 configure
+#line 10284 configure
 #include confdefs.h
 
 #if HAVE_DLFCN_H
@@ -12442,7 +12425,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 12445 configure'  conftest.$ac_ext
+  echo '#line 12428 configure'  conftest.$ac_ext
   if { (eval echo $as_me:$LINENO: \$ac_compile\) 5
   (eval $ac_compile) 25
   ac_status=$?
@@ -14160,11 +14143,11 @@
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
-   (eval echo

[llvm-commits] CVS: llvm/Makefile

2006-09-03 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.64 - 1.65
---
Log message:

Document build order dependencies.  Make sure that llvm-config is built before
tools.


---
Diffs of the changes:  (+12 -1)

 Makefile |   13 -
 1 files changed, 12 insertions(+), 1 deletion(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.64 llvm/Makefile:1.65
--- llvm/Makefile:1.64  Tue Aug 15 19:43:50 2006
+++ llvm/Makefile   Sun Sep  3 23:27:07 2006
@@ -8,7 +8,18 @@
 
#======#
 
 LEVEL := .
-DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
+
+# Top-Level LLVM Build Stages:
+#   1. Build lib/System and lib/Support, which are used by utils (tblgen).
+#   2. Build utils, which is used by VMCore.
+#   3. Build VMCore, which builds the Intrinsics.inc file used by libs.
+#   4. Build libs, which are needed by llvm-config.
+#   5. Build llvm-config, which determines inter-lib dependencies for tools.
+#   6. Build tools, runtime, docs.
+#
+DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+tools runtime docs
+
 OPTIONAL_DIRS := examples projects
 EXTRA_DIST := test llvm.spec include win32 Xcode
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-08-15 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.63 - 1.64
---
Log message:

Add .PHONY targets for building source and binary RPM packages. You can
now just make rpm or make srpm and it will build them. 


---
Diffs of the changes:  (+7 -0)

 Makefile |7 +++
 1 files changed, 7 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.63 llvm/Makefile:1.64
--- llvm/Makefile:1.63  Wed Jul 26 14:10:34 2006
+++ llvm/Makefile   Tue Aug 15 19:43:50 2006
@@ -100,3 +100,10 @@
 check-llvm2cpp:
$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
 
+srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+   rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
+
+rpm: $(LLVM_OBJ_ROOT)/llvm.spec 
+   rpmbuild -bb --target $(TARGET_TRIPLE) $(LLVM_OBJ_ROOT)/llvm.spec
+
+.PHONY: srpm rpm



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-07-26 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.62 - 1.63
---
Log message:

Revamp this to use filter-out, which makes the logic simpler and not nested.

This restores building of examples and projects!


---
Diffs of the changes:  (+18 -21)

 Makefile |   39 ++-
 1 files changed, 18 insertions(+), 21 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.62 llvm/Makefile:1.63
--- llvm/Makefile:1.62  Fri Jun  2 17:41:18 2006
+++ llvm/Makefile   Wed Jul 26 14:10:34 2006
@@ -7,39 +7,35 @@
 # 
 
#======#
 
-LEVEL = .
-DIRS = lib/System lib/Support utils lib/VMCore lib
+LEVEL := .
+DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
+OPTIONAL_DIRS := examples projects
+EXTRA_DIST := test llvm.spec include win32 Xcode
 
 include $(LEVEL)/Makefile.config 
 
+# llvm-gcc4 doesn't need runtime libs.
+ifeq ($(LLVMGCC_MAJVERS),4)
+  DIRS := $(filter-out runtime, $(DIRS))
+endif
 
-ifeq ($(MAKECMDGOALS),tools-only)
-  DIRS += tools
-else
-  ifneq ($(MAKECMDGOALS),libs-only)
-DIRS += tools
-ifneq ($(LLVMGCC_MAJVERS),4)
-  DIRS += runtime
-else
-  $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
-endif
+ifeq ($(MAKECMDGOALS),libs-only)
+  DIRS := $(filter-out tools runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
+endif
 
-DIRS += docs
-  endif
+ifeq ($(MAKECMDGOALS),tools-only)
+  DIRS := $(filter-out runtime docs, $(DIRS))
+  OPTIONAL_DIRS :=
 endif
 
-# Don't install utils, they are only used to build LLVM.
-#
+# Don't install utils, examples, or projects they are only used to 
+# build LLVM.
 ifeq ($(MAKECMDGOALS),install)
   DIRS := $(filter-out utils, $(DIRS))
-
-  # Don't install examples or projects.
   OPTIONAL_DIRS :=
 endif
 
-
-EXTRA_DIST := test llvm.spec include win32 Xcode
-
 # Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
@@ -103,3 +99,4 @@
 
 check-llvm2cpp:
$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-06-02 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.60 - 1.61
---
Log message:

Part of PR728: http://llvm.cs.uiuc.edu/PR728 , don't install examples or 
projects.


---
Diffs of the changes:  (+5 -1)

 Makefile |6 +-
 1 files changed, 5 insertions(+), 1 deletion(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.60 llvm/Makefile:1.61
--- llvm/Makefile:1.60  Thu Jun  1 02:27:53 2006
+++ llvm/Makefile   Fri Jun  2 17:34:39 2006
@@ -21,7 +21,11 @@
 else
   $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
 endif
-OPTIONAL_DIRS := examples projects
+
+# Don't install examples or projects.
+ifneq ($(MAKECMDGOALS),install)
+  OPTIONAL_DIRS := examples projects
+endif
 DIRS += docs
   endif
 endif



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-06-02 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.61 - 1.62
---
Log message:

More of PR728: http://llvm.cs.uiuc.edu/PR728 , don't install utils either.


---
Diffs of the changes:  (+14 -4)

 Makefile |   18 ++
 1 files changed, 14 insertions(+), 4 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.61 llvm/Makefile:1.62
--- llvm/Makefile:1.61  Fri Jun  2 17:34:39 2006
+++ llvm/Makefile   Fri Jun  2 17:41:18 2006
@@ -6,11 +6,13 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 
#======#
+
 LEVEL = .
 DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 
+
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
 else
@@ -22,15 +24,23 @@
   $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
 endif
 
-# Don't install examples or projects.
-ifneq ($(MAKECMDGOALS),install)
-  OPTIONAL_DIRS := examples projects
-endif
 DIRS += docs
   endif
 endif
+
+# Don't install utils, they are only used to build LLVM.
+#
+ifeq ($(MAKECMDGOALS),install)
+  DIRS := $(filter-out utils, $(DIRS))
+
+  # Don't install examples or projects.
+  OPTIONAL_DIRS :=
+endif
+
+
 EXTRA_DIST := test llvm.spec include win32 Xcode
 
+# Include the main makefile machinery.
 include $(LLVM_SRC_ROOT)/Makefile.rules
 
 # Specify options to pass to configure script when we're



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-06-01 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.59 - 1.60
---
Log message:

Make a shorthand target for running the llvm2cpp test suite. This test
suite is disabled by default because of the length of time it takes to
run. To enable it certain command line fu must be used. This patch just
encodes the command line fu as the magical check-llvm2cpp target.


---
Diffs of the changes:  (+2 -0)

 Makefile |2 ++
 1 files changed, 2 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.59 llvm/Makefile:1.60
--- llvm/Makefile:1.59  Wed May 17 17:55:35 2006
+++ llvm/Makefile   Thu Jun  1 02:27:53 2006
@@ -87,3 +87,5 @@
$(Echo) '*' make an optimized build.
 endif
 
+check-llvm2cpp:
+   $(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile Makefile.rules

2006-05-17 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.58 - 1.59
Makefile.rules updated: 1.369 - 1.370
---
Log message:

Make some changes suggested by Chris:
1. Remove the LLVM_DO_NOT_BUILD feature (not needed any more)
2. Ensure that lib/VMCore gets built first. This needs to be done because
   VMCore now uses tblgen to generate the Intrinsics header which are 
   needed in other libraries. In parallel builds, this can cause problems.


---
Diffs of the changes:  (+5 -13)

 Makefile   |2 +-
 Makefile.rules |   16 
 2 files changed, 5 insertions(+), 13 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.58 llvm/Makefile:1.59
--- llvm/Makefile:1.58  Wed Apr 12 15:53:14 2006
+++ llvm/Makefile   Wed May 17 17:55:35 2006
@@ -7,7 +7,7 @@
 # 
 
#======#
 LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore lib
 
 include $(LEVEL)/Makefile.config 
 


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.369 llvm/Makefile.rules:1.370
--- llvm/Makefile.rules:1.369   Tue May 16 01:51:02 2006
+++ llvm/Makefile.rules Wed May 17 17:55:35 2006
@@ -472,9 +472,7 @@
$(MKDIR) $$dir; \
$(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
  fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-   ($(MAKE) -C $$dir $@ ) || exit 1; \
- fi ; \
+ ($(MAKE) -C $$dir $@ ) || exit 1; \
done
 endif
 
@@ -489,9 +487,7 @@
$(MKDIR) $$dir; \
$(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
  fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
-   ($(MAKE) -C $$dir $@ ) || exit 0; \
- fi ; \
+ ($(MAKE) -C $$dir $@ ) || exit 0; \
done
 endif
 
@@ -517,9 +513,7 @@
  $(MKDIR) $(@D); \
  $(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
fi; \
-   if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
-   fi
+   $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ;
 endif
 
 #-
@@ -537,9 +531,7 @@
  $(MKDIR) $$dir; \
  $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
fi; \
-   if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- ($(MAKE) -C$$dir $@ ) || exit 1; \
-   fi ; \
+   ($(MAKE) -C$$dir $@ ) || exit 1; \
  fi \
done
 endif



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-12 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.57 - 1.58
---
Log message:

Include the win32 and Xcode directories in the distribution.


---
Diffs of the changes:  (+1 -1)

 Makefile |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.57 llvm/Makefile:1.58
--- llvm/Makefile:1.57  Fri Apr  7 21:14:37 2006
+++ llvm/Makefile   Wed Apr 12 15:53:14 2006
@@ -25,7 +25,7 @@
 DIRS += docs
   endif
 endif
-EXTRA_DIST := test llvm.spec include
+EXTRA_DIST := test llvm.spec include win32 Xcode
 
 include $(LLVM_SRC_ROOT)/Makefile.rules
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-07 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.52 - 1.53
---
Log message:

For PR723: http://llvm.cs.uiuc.edu/PR723 :
Print out something at the end of the build that indicates what kind of
build has just completed.


---
Diffs of the changes:  (+10 -0)

 Makefile |   10 ++
 1 files changed, 10 insertions(+)


Index: llvm/Makefile
diff -u llvm/Makefile:1.52 llvm/Makefile:1.53
--- llvm/Makefile:1.52  Thu Apr  6 17:15:50 2006
+++ llvm/Makefile   Fri Apr  7 10:58:18 2006
@@ -74,3 +74,13 @@
$(Echo) Regenerating $*
$(Verb) cd $(LLVM_OBJ_ROOT)  $(ConfigStatusScript) $*
 .PRECIOUS: $(FilesToConfigPATH)
+
+#NOTE: THis needs to remain as the last target definition in this file so
+#that it gets executed last.
+all:: 
+   $(Echo) '*' Completed $(BuildMode)$(AssertMode) Build
+ifeq ($(BuildMode),Debug)
+   $(Echo) '*' Note: Debug build can be 10 times slower than an
+   $(Echo) '*' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
+   $(Echo) '*' make an optimized build.
+endif



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-07 Thread Chris Lattner 


Changes in directory llvm:

Makefile updated: 1.53 - 1.54
---
Log message:

THis - This


---
Diffs of the changes:  (+3 -2)

 Makefile |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.53 llvm/Makefile:1.54
--- llvm/Makefile:1.53  Fri Apr  7 10:58:18 2006
+++ llvm/Makefile   Fri Apr  7 11:21:59 2006
@@ -75,8 +75,8 @@
$(Verb) cd $(LLVM_OBJ_ROOT)  $(ConfigStatusScript) $*
 .PRECIOUS: $(FilesToConfigPATH)
 
-#NOTE: THis needs to remain as the last target definition in this file so
-#that it gets executed last.
+# NOTE: This needs to remain as the last target definition in this file so
+# that it gets executed last.
 all:: 
$(Echo) '*' Completed $(BuildMode)$(AssertMode) Build
 ifeq ($(BuildMode),Debug)
@@ -84,3 +84,4 @@
$(Echo) '*' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
$(Echo) '*' make an optimized build.
 endif
+



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-07 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.54 - 1.55
---
Log message:

Invert the tests on LLVMGCC_MAJVERS to check for value 4 instead of value
3. This ensures that if llvm-gcc isn't available and consequently the value
of LLVMGCC_MAJVERS is blank, that the old (include runtime) behavior will
persist.


---
Diffs of the changes:  (+1 -1)

 Makefile |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.54 llvm/Makefile:1.55
--- llvm/Makefile:1.54  Fri Apr  7 11:21:59 2006
+++ llvm/Makefile   Fri Apr  7 16:45:23 2006
@@ -16,7 +16,7 @@
 else
   ifneq ($(MAKECMDGOALS),libs-only)
 DIRS += tools
-ifeq ($(LLVMGCC_MAJVERS),3)
+ifneq ($(LLVMGCC_MAJVERS),4)
   DIRS += runtime
 else
   $(warning Skipping runtime libraries, llvm-gcc 4 detected.)



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-07 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.55 - 1.56
---
Log message:

Don't build projects/examples if libs-only was specified.


---
Diffs of the changes:  (+1 -1)

 Makefile |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.55 llvm/Makefile:1.56
--- llvm/Makefile:1.55  Fri Apr  7 16:45:23 2006
+++ llvm/Makefile   Fri Apr  7 20:57:10 2006
@@ -22,8 +22,8 @@
   $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
 endif
 DIRS += docs
+OPTIONAL_DIRS = examples projects
   endif
-  OPTIONAL_DIRS = examples projects
 endif
 EXTRA_DIST := test llvm.spec include
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-07 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.56 - 1.57
---
Log message:

Fix recursion:
1. Make setting OPTIONAL_DIRS use immediate assignment
2. Include Makefile.config before ifeq tests and then Makefile.rules later
   instead of Makefile.common up front. This ensures that the variable 
   values are set before the ifeq statements in Makefile.rules are
   evaluated.
With this, recursion into projects/examples is corrected.


---
Diffs of the changes:  (+4 -2)

 Makefile |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.56 llvm/Makefile:1.57
--- llvm/Makefile:1.56  Fri Apr  7 20:57:10 2006
+++ llvm/Makefile   Fri Apr  7 21:14:37 2006
@@ -9,7 +9,7 @@
 LEVEL = .
 DIRS = lib/System lib/Support utils lib
 
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.config 
 
 ifeq ($(MAKECMDGOALS),tools-only)
   DIRS += tools
@@ -21,12 +21,14 @@
 else
   $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
 endif
+OPTIONAL_DIRS := examples projects
 DIRS += docs
-OPTIONAL_DIRS = examples projects
   endif
 endif
 EXTRA_DIST := test llvm.spec include
 
+include $(LLVM_SRC_ROOT)/Makefile.rules
+
 # Specify options to pass to configure script when we're
 # running the dist-check target
 DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

[llvm-commits] CVS: llvm/Makefile

2006-04-06 Thread Reid Spencer 


Changes in directory llvm:

Makefile updated: 1.51 - 1.52
---
Log message:

Avoid building the runtime libraries if llvm-gcc version 4 is detected.


---
Diffs of the changes:  (+11 -6)

 Makefile |   17 +++--
 1 files changed, 11 insertions(+), 6 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.51 llvm/Makefile:1.52
--- llvm/Makefile:1.51  Wed Aug 24 23:59:49 2005
+++ llvm/Makefile   Thu Apr  6 17:15:50 2006
@@ -9,19 +9,24 @@
 LEVEL = .
 DIRS = lib/System lib/Support utils lib
 
+include $(LEVEL)/Makefile.common
+
 ifeq ($(MAKECMDGOALS),tools-only)
-DIRS += tools
+  DIRS += tools
 else
   ifneq ($(MAKECMDGOALS),libs-only)
-DIRS += tools runtime docs
-OPTIONAL_DIRS = examples projects
+DIRS += tools
+ifeq ($(LLVMGCC_MAJVERS),3)
+  DIRS += runtime
+else
+  $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
+endif
+DIRS += docs
   endif
+  OPTIONAL_DIRS = examples projects
 endif
-
 EXTRA_DIST := test llvm.spec include
 
-include $(LEVEL)/Makefile.common
-
 # Specify options to pass to configure script when we're
 # running the dist-check target
 DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits