[llvm-commits] [llvm] r48150 - /llvm/trunk/bindings/ocaml/Makefile.ocaml

Gordon Henriksen gordonhenriksen at mac.com
Mon Mar 10 09:15:32 PDT 2008


Author: gordon
Date: Mon Mar 10 11:15:32 2008
New Revision: 48150

URL: http://llvm.org/viewvc/llvm-project?rev=48150&view=rev
Log:
Refresh Makefile.ocaml in objdir if it is modified in srcdir.

Patch by Erick Tryzelaar!

Modified:
    llvm/trunk/bindings/ocaml/Makefile.ocaml

Modified: llvm/trunk/bindings/ocaml/Makefile.ocaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/Makefile.ocaml?rev=48150&r1=48149&r2=48150&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/Makefile.ocaml (original)
+++ llvm/trunk/bindings/ocaml/Makefile.ocaml Mon Mar 10 11:15:32 2008
@@ -38,10 +38,16 @@
 
 # Tools
 OCAMLCFLAGS += -I $(OcamlDir) -I $(ObjDir)
+ifneq ($(ObjectsO),)
 OCAMLAFLAGS += $(patsubst %,-cclib %, \
                  $(filter-out -L$(LibDir),-l$(LIBRARYNAME) \
                                           $(shell $(LLVM_CONFIG) --ldflags)) \
                                           $(UsedLibs))
+else
+OCAMLAFLAGS += $(patsubst %,-cclib %, \
+                 $(filter-out -L$(LibDir),$(shell $(LLVM_CONFIG) --ldflags)) \
+                                          $(UsedLibs))
+endif
  
 # -g was introduced in 3.10.0.
 #ifneq ($(ENABLE_OPTIMIZED),1)
@@ -107,6 +113,7 @@
 
 ##===- Build static library from C sources --------------------------------===##
 
+ifneq ($(ObjectsO),)
 all-local:: $(LibraryA)
 clean-local:: clean-a
 install-local:: install-a
@@ -130,6 +137,7 @@
 uninstall-a::
 	$(Echo) "Uninstalling $(DestA)"
 	-$(Verb) $(RM) -f $(DestA)
+endif
 
 
 ##===- Deposit dependent libraries adjacent to Ocaml libs -----------------===##





More information about the llvm-commits mailing list