fix distcheck

SVN revision: 9733

Makefile.am

@@ -1,15 +1,11 @@
-
-## Process this file with automake to produce Makefile.in
-
 AUTOMAKE_OPTIONS     = 1.4 foreign
 
-# A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \
 		       config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in
 
-SUBDIRS		     = src filters doc loaders
+SUBDIRS		     = src filters doc loaders test demo
 
 bin_SCRIPTS = imlib2-config
 

configure.in

@@ -355,14 +355,15 @@ AC_SUBST(dlopen_libs)
 AC_SUBST(freetype_cflags)
 AC_SUBST(freetype_libs)
 
+AC_SUBST(pkglibdir)
+
 dnl AC_SUBST(freetype_libs)
 dnl AC_SUBST(freetype_includes)
 
 AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile test/Makefile \
-          filters/Makefile demo/Makefile doc/Makefile \
+          filters/Makefile demo/Makefile doc/Makefile src/loaderpath.h \
 	  ])
 AC_CONFIG_COMMANDS([default],[[
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h;
 chmod +x imlib2-config
 ]],[[]])
 AC_OUTPUT

demo/Makefile.am

@@ -14,5 +14,4 @@ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
 bin_PROGRAMS         = imlib2_view imconvert
 imconvert_SOURCES    = imconvert.c
 imlib2_view_SOURCES  = view.c 
-LDADD    = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                       $(x_libs) -lttf $(top_builddir)/src/libImlib2.la
+LDADD    = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la

src/Makefile.am

@@ -7,6 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in loaderpath.h
 
 LDFLAGS		     = -L/usr/X11R6/lib
 INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
+		       -I$(top_builddir)/src \
                        -I$(top_srcdir)/loaders \
                        $(freetype_cflags) -I/usr/X11R6/include $(X_CFLAGS) \
                        -I$(prefix)/include -I$(includedir)
@@ -41,9 +42,3 @@ libImlib2_la_LIBADD   = $(X_OBJS) @DLLDFLAGS@ \
                        $(x_libs) $(freetype_libs) $(LDFLAGS) -lm
 libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
 endif
-
-SYS_LOADERS_PATH = @pkglibdir@
-image.lo: loaderpath.h
-loaderpath.h: Makefile
-	@echo "#define SYS_LOADERS_PATH \"${SYS_LOADERS_PATH}\"" > $@
-	@echo "#define USER_LOADERS_PATH \".loaders\"" >> $@

src/loaderpath.h.in

@@ -0,0 +1,2 @@
+#define SYS_LOADERS_PATH "@pkglibdir@"
+#define USER_LOADERS_PATH ".loaders"

test/Makefile.am

@@ -13,21 +13,16 @@ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
 
 bin_PROGRAMS         = imlib2 bumpmaptest imlib2_test polytest color_spaces
 imlib2_SOURCES       = main.c
-imlib2_LDADD         = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                        $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm
+imlib2_LDADD         = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la
 
 bumpmaptest_SOURCES  = bmtest.c
-bumpmaptest_LDADD    = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                        $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm
+bumpmaptest_LDADD    = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la
 
 imlib2_test_SOURCES  = imlib2_test.c
-imlib2_test_LDADD    = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                        $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm
+imlib2_test_LDADD    = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la
 
 polytest_SOURCES     = polytest.c
-polytest_LDADD       = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                        $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm
+polytest_LDADD       = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la
 
 color_spaces_SOURCES = color_spaces.c
-color_spaces_LDADD   = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
-                        $(x_libs) -lttf $(top_builddir)/src/libImlib2.la -lm
+color_spaces_LDADD   = @DLLDFLAGS@ $(top_builddir)/src/libImlib2.la