53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
--- GNUmakefile.am
|
|
+++ GNUmakefile.am
|
|
@@ -26,6 +26,8 @@
|
|
LIBEXPORTER =
|
|
endif
|
|
|
|
+AUTOMAKE_OPTIONS=foreign
|
|
+
|
|
DIST_SUBDIRS = xml help wingdingfont patterns glib-wv libole2 magick expat exporter .
|
|
|
|
SUBDIRS = xml help wingdingfont patterns $(DIRGLIB) libole2 magick $(DIREXPAT) $(DIREXPORTER) .
|
|
@@ -37,7 +39,7 @@
|
|
|
|
CFLAGS = @CFLAGS@ @ANSI_CFLAGS@
|
|
|
|
-CPPFLAGS = @CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
|
|
+CPPFLAGS = $(filter-out -I/usr/include,@CPPFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@)
|
|
|
|
WVLIBS = @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @ICONV_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
|
|
|
|
--- exporter/GNUmakefile.am
|
|
+++ exporter/GNUmakefile.am
|
|
@@ -6,7 +6,7 @@
|
|
|
|
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
|
|
|
|
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
|
|
+AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
|
|
|
|
wvhdrdir = $(includedir)/wv
|
|
|
|
--- libole2/GNUmakefile.am
|
|
+++ libole2/GNUmakefile.am
|
|
@@ -6,7 +6,7 @@
|
|
|
|
INCLUDES = -I. -I$(top_builddir) -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/libole2 -I$(top_srcdir)/oledecod $(INCGLIB)
|
|
|
|
-CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
|
|
+AM_CPPFLAGS = @CPPFLAGS@ @GLIB_CFLAGS@ @ICONV_CFLAGS@ @ZLIB_CFLAGS@
|
|
|
|
noinst_LTLIBRARIES = libole2.la
|
|
|
|
--- magick/GNUmakefile.am
|
|
+++ magick/GNUmakefile.am
|
|
@@ -1,6 +1,6 @@
|
|
INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(srcdir)/magick
|
|
|
|
-CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
|
|
+AM_CPPFLAGS = @CPPFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@
|
|
|
|
noinst_LTLIBRARIES = libmagick.la
|
|
|