From dc5660047c3396be1feec73d91dea5e004a71454 Mon Sep 17 00:00:00 2001
From: doursse <doursse>
Date: Sat, 19 Apr 2008 21:18:12 +0000
Subject: [PATCH] put WIN32_CFLAGS in CFLAGS, not CPPFLAGS. Formatting

SVN revision: 34312
---
 legacy/eet/configure.in        |  2 +-
 legacy/eet/src/bin/Makefile.am |  4 +++-
 legacy/eet/src/lib/Makefile.am | 12 +++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in
index 52f322e46d..d806a8df09 100644
--- a/legacy/eet/configure.in
+++ b/legacy/eet/configure.in
@@ -33,7 +33,7 @@ WIN32_LIBS=""
 lt_no_undefined=""
 lt_enable_auto_import=""
 case "$host_os" in
-	mingw|mingw32*|cegcc)
+	mingw*|cegcc)
 		PKG_CHECK_MODULES([EVIL], [evil])
 		AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
 		dnl needed for correct definition of EAPI
diff --git a/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am
index 8f8ae07fab..024932f02f 100644
--- a/legacy/eet/src/bin/Makefile.am
+++ b/legacy/eet/src/bin/Makefile.am
@@ -12,5 +12,7 @@ AM_CPPFLAGS = \
 bin_PROGRAMS = eet
 
 eet_SOURCES = eet_main.c
-eet_LDADD = $(top_builddir)/src/lib/libeet.la @lt_enable_auto_import@
+eet_CFLAGS = @WIN32_CFLAGS@
+eet_LDADD = $(top_builddir)/src/lib/libeet.la
+eet_LDFLAGS = @lt_enable_auto_import@
 eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la
diff --git a/legacy/eet/src/lib/Makefile.am b/legacy/eet/src/lib/Makefile.am
index d76c056ecb..c2e3c67881 100644
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@@ -7,11 +7,12 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@WIN32_CFLAGS@ \
 @EVIL_CFLAGS@
 
-lib_LTLIBRARIES      = libeet.la
-include_HEADERS      = Eet.h
+include_HEADERS = Eet.h
+
+lib_LTLIBRARIES = libeet.la
+
 libeet_la_SOURCES  = \
 eet_lib.c \
 eet_data.c \
@@ -20,8 +21,9 @@ eet_memfile.c \
 eet_dictionary.c \
 eet_utils.c
 
-libeet_la_LIBADD       = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm
+libeet_la_CFLAGS = @WIN32_CFLAGS@
+libeet_la_LIBADD = @EVIL_LIBS@ @WIN32_LIBS@ -lz -ljpeg @fnmatch_libs@ -lm
+libeet_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
 libeet_la_DEPENDENCIES = $(top_builddir)/config.h
-libeet_la_LDFLAGS      = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
 
 EXTRA_DIST = Eet_private.h