1diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac
2--- liblbxutil-1.1.0.orig/configure.ac	2009-12-04 23:52:04.000000000 +0100
3+++ liblbxutil-1.1.0/configure.ac	2009-12-16 10:45:00.000000000 +0100
4@@ -50,4 +50,5 @@
5
6 AC_OUTPUT([Makefile
7 	   src/Makefile
8+	   src/image/Makefile
9 	   lbxutil.pc])
10diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am
11--- liblbxutil-1.1.0.orig/src/image/Makefile.am	1970-01-01 01:00:00.000000000 +0100
12+++ liblbxutil-1.1.0/src/image/Makefile.am	2009-12-16 10:45:00.000000000 +0100
13@@ -0,0 +1,15 @@
14+# evil hack
15+CFLAGS=$(CFLAGS_FOR_BUILD)
16+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
17+LDFLAGS=$(LDFLAGS_FOR_BUILD)
18+
19+CC=$(CC_FOR_BUILD)
20+LIBTOOL = @LIBTOOL@ --tag=CC
21+
22+noinst_PROGRAMS = mkg3states
23+
24+mkg3states_SOURCES =				\
25+	mkg3states.c
26+
27+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
28+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
29diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am
30--- liblbxutil-1.1.0.orig/src/Makefile.am	2009-12-16 10:48:11.000000000 +0100
31+++ liblbxutil-1.1.0/src/Makefile.am	2009-12-16 10:46:47.000000000 +0100
32@@ -3,10 +3,7 @@
33 AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
34 INCLUDES = -I$(top_srcdir)/include
35
36-noinst_PROGRAMS = mkg3states
37-
38-mkg3states_SOURCES =				\
39-	$(srcdir)/image/mkg3states.c
40+SUBDIRS = image
41
42 liblbxutil_la_SOURCES =				\
43 	$(srcdir)/lbx_zlib/reqstats.h		\
44@@ -38,9 +35,8 @@
45
46 $(srcdir)/image/dfaxg42d.c: g3states.h
47
48-g3states.h: mkg3states
49-	-rm -f g3states.h
50-	$(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
51+g3states.h: image/mkg3states
52+	$(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
53
54 liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
55
56