lilypond-0.0.49

diff --git a/configure.in b/configure.in
index ac091d7d15584b5b801155880f55c62ad5b8fb88..17f737ab456f0d226df9e0351589063ebba4c4e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -44,7 +44,7 @@ checking_b=yes
 debug_b=yes
 optimise_b=no
 profile_b=no
-    
+#shared_b=no
 AC_ARG_ENABLE(printing,
     [  enable-printing        set debug printing],
     [printing_b=$enableval])
@@ -128,7 +128,7 @@ if test $MAKE = "error"
 then
        AC_MSG_ERROR(Please install GNU make)
 else
-       $MAKE -v| grep GNU >& /dev/null
+       $MAKE -v| grep GNU > /dev/null
        if test "$?" = 1
        then
                AC_MSG_WARN(Please install *GNU* make)
@@ -151,7 +151,7 @@ then
        AC_MSG_WARN(can't find flex. Please install Flex (2.5 or better))
 fi
 
-if $CXX --version | grep '2\.7' >& /dev/null
+if $CXX --version | grep '2\.7' > /dev/null
 then
        true
 else
@@ -203,4 +203,10 @@ If you only want help on the make targets, do a
 
        make help
 
+
 END
+
+    
+#if test $shared_b = yes; then
+#    echo "NOTE: you are building the *shared* library. You should 
+#fi    

diff --git a/flower/config.hh.in b/flower/config.hh.in
index 8747c8ffe4759b0a1ab53ebadd4a38b09baa3b10..9f3b9821143763c3d13e4f192d2cfa6442dafb5c 100644 (file)
--- a/flower/config.hh.in
+++ b/flower/config.hh.in
@@ -3,6 +3,3 @@
 
 /* define if you have snprintf */
 #define HAVE_SNPRINTF 0
-
-/* just testing */
-#define HAVE_FOOBAR 0

diff --git a/flower/test/Makefile b/flower/test/Makefile
index 3de2bbdc7069995040ccf27b3d54615e0af14c46..1d909660e28f5ba17052ca83a2354e3eb310cb70 100644 (file)
--- a/flower/test/Makefile
+++ b/flower/test/Makefile
@@ -28,20 +28,6 @@ include ./$(depth)/make/Variables.make
 include ./$(depth)/make/Files.make 
 #
 
-# descent order into subdirectories:
-#
-SUBDIRS =
-#
-
-# to be remade each build:
-#
-VERSION_DEPENDENCY = #
-#
-
-# module compile settings: (not generally needed!
-#
-
-
 # list of distribution files:
 #
 EXTRA_DISTFILES = result 
@@ -56,18 +42,15 @@ MODULE_LIBES = -lflower
 
 # main target of this module:
 #
-# MAINTARGET = $(EXECUTABLE)
-# MAINTARGET = $(LIBRARY)
 MAINTARGET = $(lily_bindir)/$(EXECUTABLE)# huh?
-# MAINTARGET = $(libdir)/$(LIBRARY)# huh?
-
-#default: $(MAINTARGET)
 BUILDSTRINGTEST=$(MAINTARGET)
 EXECSTRINGTEST=$(EXECUTABLE)
 
-default:  $(BUILDSTRINGTEST) do-stringtest
+# don't do the exec, as this might fail if flowerlib isn't installed yet.
+default:  $(BUILDSTRINGTEST) 
+
 do-stringtest:
-       $(EXECSTRINGTEST) > $(outdir)/result    # should cmp with a 'standard result'
+       $(EXECSTRINGTEST) > $(outdir)/result
        cmp $(outdir)/result result
 
 dummy:
@@ -76,12 +59,7 @@ dummy:
 #
 include ./$(depth)/make/Targets.make
 include ./$(depth)/make/Rules.make
-#
 
-# list of depend files:
-#
-DEPFILES = $(wildcard $(depdir)/*.dep )
-#
 
 # auto dependencies:
 #