forked from enlightenment/efl
put WIN32_CFLAGS in CFLAGS, not CPPFLAGS. Formatting
SVN revision: 34312
This commit is contained in:
parent
6152e13f48
commit
dc5660047c
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue