From 4bb49ca9181782c2dfded99a698d5e7c2eeb31cc Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 2 Nov 2004 03:15:13 +0000
Subject: [PATCH] ldflags by bye

SVN revision: 12120
---
 configure.in                    | 10 ----------
 src/lib/Makefile.am             |  7 ++++++-
 src/modules/filters/Makefile.am |  6 +++---
 src/modules/loaders/Makefile.am | 24 ++++++++++++------------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/configure.in b/configure.in
index 289f7ca..121abe7 100644
--- a/configure.in
+++ b/configure.in
@@ -124,16 +124,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_MMX, test x$mmx = xyes)
 
-ASFLAGS="$ASFLAGS -I../"
-AS=$CC
-AC_SUBST(ASFLAGS)
-AC_SUBST(AS)
-  
-CCASFLAGS="$ASFLAGS"
-CCAS="$AS"
-AC_SUBST(CCASFLAGS)
-AC_SUBST(CCAS)
-  
 # check for freetype
 AC_ARG_WITH(freetype-config,
 [  --with-freetype-config=FREETYPE_CONFIG    use freetype-config specified ],
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3476202..6e9787f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -62,6 +62,11 @@ updates.h \
 ximage.c \
 ximage.h
 
+AS        = $(CC)
+CCAS      = $(CC)
+ASFLAGS   = $(ASFLAGS) -I$(top_srcdir) -I$(top_builddir)
+CCASFLAGS = $(ASFLAGS) -I$(top_srcdir) -I$(top_builddir)
+
 MMX_SRCS = \
 asm_blend.S \
 asm_blend_cmod.S \
@@ -80,4 +85,4 @@ else
 libImlib2_la_LIBADD       = @my_libs@
 libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
 endif
-libImlib2_la_LDFLAGS      = $(LDFLAGS) -version-info 3:0:2
+libImlib2_la_LDFLAGS      = -version-info 3:0:2
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
index 90b3a81..28bf86f 100644
--- a/src/modules/filters/Makefile.am
+++ b/src/modules/filters/Makefile.am
@@ -11,11 +11,11 @@ pkgdir                = $(libdir)/imlib2/filters
 pkg_LTLIBRARIES       = testfilter.la bumpmap.la colormod.la
 
 testfilter_la_SOURCES = filter_test.c
-testfilter_la_LDFLAGS = $(LDFLAGS) -module -avoid-version
+testfilter_la_LDFLAGS = -module -avoid-version
 
 bumpmap_la_SOURCES    = filter_bumpmap.c
-bumpmap_la_LDFLAGS    = $(LDFLAGS) -module -avoid-version
+bumpmap_la_LDFLAGS    = -module -avoid-version
 
 colormod_la_SOURCES   = filter_colormod.c
-colormod_la_LDFLAGS   = $(LDFLAGS) -module -avoid-version
+colormod_la_LDFLAGS   = -module -avoid-version
 
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index 2d6b596..ada4748 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -43,49 +43,49 @@ tga.la \
 lbm.la
 
 jpeg_la_SOURCES      = loader_jpeg.c
-jpeg_la_LDFLAGS      = $(LDFLAGS) -module -avoid-version
+jpeg_la_LDFLAGS      = -module -avoid-version
 jpeg_la_LIBADD       = @JPEGLIBS@
 
 png_la_SOURCES       = loader_png.c
-png_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+png_la_LDFLAGS       = -module -avoid-version
 png_la_LIBADD        = @PNGLIBS@
                        
 tiff_la_SOURCES      = loader_tiff.c
-tiff_la_LDFLAGS      = $(LDFLAGS) -module -avoid-version
+tiff_la_LDFLAGS      = -module -avoid-version
 tiff_la_LIBADD       = @TIFFLIBS@
 
 gif_la_SOURCES       = loader_gif.c
-gif_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+gif_la_LDFLAGS       = -module -avoid-version
 gif_la_LIBADD        = @GIFLIBS@
 
 zlib_la_SOURCES      = loader_zlib.c
-zlib_la_LDFLAGS      = $(LDFLAGS) -module -avoid-version
+zlib_la_LDFLAGS      = -module -avoid-version
 zlib_la_LIBADD       = @ZLIBLIBS@ 
 
 bz2_la_SOURCES       = loader_bz2.c
-bz2_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+bz2_la_LDFLAGS       = -module -avoid-version
 bz2_la_LIBADD        = @BZ2LIBS@ 
 
 pnm_la_SOURCES       = loader_pnm.c
-pnm_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+pnm_la_LDFLAGS       = -module -avoid-version
 pnm_la_LIBADD        = 
 
 argb_la_SOURCES      = loader_argb.c
-argb_la_LDFLAGS      = $(LDFLAGS) -module -avoid-version
+argb_la_LDFLAGS      = -module -avoid-version
 argb_la_LIBADD       = 
 
 bmp_la_SOURCES       = loader_bmp.c
-bmp_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+bmp_la_LDFLAGS       = -module -avoid-version
 bmp_la_LIBADD        = 
 
 xpm_la_SOURCES       = loader_xpm.c
-xpm_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+xpm_la_LDFLAGS       = -module -avoid-version
 xpm_la_LIBADD        = 
 
 tga_la_SOURCES       = loader_tga.c
-tga_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+tga_la_LDFLAGS       = -module -avoid-version
 tga_la_LIBADD        = 
 
 lbm_la_SOURCES       = loader_lbm.c
-lbm_la_LDFLAGS       = $(LDFLAGS) -module -avoid-version
+lbm_la_LDFLAGS       = -module -avoid-version
 lbm_la_LIBADD        =