From: fred <fred>
Date: Mon, 3 Mar 1997 14:51:10 +0000 (+0000)
Subject: flower-1.1.4
X-Git-Tag: release/1.5.59~6285
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d93c14a2c88ca8e68ce292fc957b727b35319bb7;p=lilypond.git

flower-1.1.4
---

diff --git a/flower/Variables.make b/flower/Variables.make
index d8cca75c97..564acd8c63 100644
--- a/flower/Variables.make
+++ b/flower/Variables.make
@@ -1,12 +1,12 @@
 MAJVER=1
 MINVER=1
-PATCHLEVEL=3
+PATCHLEVEL=4
 
 PACKAGENAME=flower
 
 #PROFILEFLAG=-pg
 #DEBUGFLAG= -g
-OPTIFLAG= -DNPRINT -O2 -DSTRING_UTILS_INLINED -DNDEBUG 
+OPTIFLAG= -DNPRINT -O2 -DSTRING_UTILS_INLINED # -DNDEBUG 
 
 #########################################
 
@@ -29,11 +29,17 @@ VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL)
 DNAME=$(PACKAGENAME)-$(VERSION)
 
 include Sources.make
+OBJECTDIR=objects
+CCDIR=.
+obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) 
 
-obs=$(cc:.cc=.o)
 staticlib=libflower.a
 ALLSOURCES=$(hh) $(cc) $(inl) $(templatecc) $(extra)
 DFILES=$(ALLSOURCES) Makefile Variables.make make_version\
 	Sources.make TODO README NEWS
 DDIR=$(DNAME)
 
+depfile=deps/$(subst .o,.dep,$(notdir $@)) 
+DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(OBJECTDIR)/$(notdir $@)"
+OUTPUT_OPTION=$< -o $@
+SUBDIRS=deps objects