Clean up build.

FL/makefile.inc

@@ -1,16 +1,9 @@
 # -*- mode: makefile; -*-
 
-# always regenerate source list when running under git
+FL_SRCS := $(wildcard FL/*.C FL/*.fl)
-FOO := $(shell [ -f .git ] && [ -x `which git` ] && rm -f FL/.sources )
-
-FL/.sources:
-	@ echo "FL_SRCS=\\" > FL/.sources
-	@ git ls-files 'FL/*.C' | tr '\n' ' ' >> FL/.sources
-	@ git ls-files 'FL/*.fl' | tr '\n' ' ' >> FL/.sources
-
--include FL/.sources
 
 FL_SRCS:=$(FL_SRCS:.fl=.C)
+FL_SRCS:=$(sort $(FL_SRCS))
 FL_OBJS:=$(FL_SRCS:.C=.o)
 
 all: FL/libfl_widgets.a

Makefile

@@ -69,27 +69,11 @@ TAGS: $(SRCS)
 clean_deps:
 	@ rm -f .deps
 
-SOURCES = Timeline/.sources FL/.sources
+.PHONEY: clean config depend clean_deps
-
-clean_sources:
-	@ rm -f $(SOURCES)
-
-.sources: $(SOURCES)
-
-rearrange: clean_deps clean_sources
-	@ $(MAKE) -s .deps
-	@ $(MAKE) -s .sources
-
-.PHONEY: clean config depend clean_deps clean_sources .sources rearrange
 
 clean: FL_clean Timeline_clean
 
-# (generated) files not in git that need to go into the distribution tarball
+dist:
-EXTRA_DIST := $(SOURCES)
+	git archive --prefix=non-daw-$(VERSION)/ v$(VERSION) | bzip2 > non-daw-$(VERSION).tar.bz2
-
-dist: .sources
-	@ echo -n Building tarball...
-	@ scripts/dist non-daw $(VERSION) $(EXTRA_DIST)
-	@ echo $(DONE)
 
 -include .deps

Timeline/Engine/Peaks.C

@@ -733,7 +733,7 @@ Peaks::Builder::make_peaks_mipmap ( void )
     {
         DMESSAGE( "building level %d peak cache", i + 1 );
 
-        DMESSAGE( "%lu", _clip->length() / cs );
+/*         DMESSAGE( "%lu", _clip->length() / cs ); */
 
         if ( _clip->length() / cs < 1 )
         {
@@ -767,6 +767,8 @@ Peaks::Builder::make_peaks_mipmap ( void )
     fclose( rfp );
     fclose( fp );
 
+    DMESSAGE( "done" );
+
     return true;
 }
 

Timeline/makefile.inc

@@ -2,19 +2,12 @@
 
 Timeline_VERSION := 0.5.0
 
-# always regenerate source list when running under git
+Timeline_SRCS := $(wildcard Timeline/*.C Timeline/*.fl Timeline/Engine/*.C)
-FOO := $(shell [ -f .git ] && [ -x `which git` ] && rm -f FL/.sources )
-
-Timeline/.sources:
-	@ echo "Timeline_SRCS=\\" > Timeline/.sources
-	@ git ls-files 'Timeline/*.C' | tr '\n' ' ' >> Timeline/.sources
-	@ git ls-files 'Timeline/*.fl' | tr '\n' ' ' >> Timeline/.sources
-
--include Timeline/.sources
 
 Timeline_SRCS += util/debug.C
 
 Timeline_SRCS:=$(Timeline_SRCS:.fl=.C)
+Timeline_SRCS:=$(sort $(Timeline_SRCS))
 Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
 
 Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LASH_LIBS)

scripts/dist

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# May 2008 Jonathan Moore Liles
-#
-# Use git to build a distribution tarball.
-#
-# USAGE:
-#
-#    dist foo 1.2.0 extra-files ...
-#
-# This will build a tarball foo-1.2.0.tar.bz2 using git tag 'v1.2.0'
-#
-# Files not in git but listed as arguemnts will also be included in the archive.
-
-. colors
-
-NAME="$1"
-shift 1
-VERSION="$1"
-shift 1
-EXTRA_DIST="$@"
-
-PREFIX="${NAME}-${VERSION}"
-git archive --prefix="${PREFIX}/" v${VERSION} > ${PREFIX}.tar
-tar --owner 0 --group 0 --transform "s:^:${PREFIX}/:" -rf ${PREFIX}.tar ${EXTRA_DIST}
-bzip2 -f ${PREFIX}.tar