add support for checking sizes of different types through configure and dynamically generating include/FLAC/ordinals.h
diff --git a/build/config.mk b/build/config.mk
new file mode 100644
index 0000000..a8b1daa
--- /dev/null
+++ b/build/config.mk
@@ -0,0 +1,34 @@
+# FLAC - Free Lossless Audio Codec
+# Copyright (C) 2001 Josh Coalson
+#
+# This program is part of FLAC; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+#
+# GNU makefile fragment for emulating stuff normally done by configure
+#
+
+VERSION=\"1.0devel\"
+
+ORDINALS_H = ../../include/FLAC/ordinals.h
+
+$(ORDINALS_H): $(ORDINALS_H).in
+ sed \
+ -e 's/@FLaC__SIZE16@/short/g' \
+ -e 's/@FLaC__SIZE32@/int/g' \
+ -e 's/@FLaC__SIZE64@/long long/g' \
+ -e 's/@FLaC__USIZE16@/unsigned short/g' \
+ -e 's/@FLaC__USIZE32@/unsigned int/g' \
+ -e 's/@FLaC__USIZE64@/unsigned long long/g' \
+ $< > $@
diff --git a/build/exe.mk b/build/exe.mk
index 18e6e8f..20f087b 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -30,13 +30,15 @@
all : release
-debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
+include ../../build/config.mk
+
+debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)
-debug : $(PROGRAM)
-release : $(PROGRAM)
+debug : $(ORDINALS_H) $(PROGRAM)
+release : $(ORDINALS_H) $(PROGRAM)
$(PROGRAM) : $(OBJS)
$(LINK) -o $@ $(OBJS) $(LFLAGS) $(LIBS)
diff --git a/build/lib.mk b/build/lib.mk
index c1090a8..db1fa77 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -29,13 +29,15 @@
all : release
-debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
-release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=\"1.0devel\" $(DEFINES) $(INCLUDES)
+include ../../build/config.mk
+
+debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
+release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
LFLAGS = -L$(LIBPATH)
-debug : $(STATIC_LIB) $(DYNAMIC_LIB)
-release : $(STATIC_LIB) $(DYNAMIC_LIB)
+debug : $(ORDINALS_H) $(STATIC_LIB) $(DYNAMIC_LIB)
+release : $(ORDINALS_H) $(STATIC_LIB) $(DYNAMIC_LIB)
$(STATIC_LIB) : $(OBJS)
$(LINK) $@ $(OBJS)
@@ -53,7 +55,7 @@
.PHONY : clean
clean :
- -rm -f $(OBJS) $(STATIC_LIB) $(DYNAMIC_LIB)
+ -rm -f $(OBJS) $(STATIC_LIB) $(DYNAMIC_LIB) $(ORDINALS_H)
.PHONY : depend
depend: