← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libwpd/quantal

« back to all changes in this revision

Viewing changes to src/conv/text/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-11-21 17:45:38 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121174538-ue68b9jzc5y8wq8e
Tags: 0.8.12-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Add debian/patches/gcc43.diff and build rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/conv/text/Makefile.am
6
6
 
7
7
bin_PROGRAMS = $(target_wpd2text)
8
8
 
9
 
AM_CXXFLAGS = $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS) -I$(top_srcdir)/src/lib
 
9
AM_CXXFLAGS = -I$(top_srcdir)/src/lib $(LIBWPD_CXXFLAGS) $(DEBUG_CXXFLAGS)
10
10
 
11
 
wpd2text_LDFLAGS = -L../../lib
12
11
wpd2text_DEPENDENCIES = @WPD2TEXT_WIN32_RESOURCE@ 
13
 
wpd2text_LDADD = -lwpd-0.8 -lwpd-stream-0.8 $(LIBWPD_LIBS) @WPD2TEXT_WIN32_RESOURCE@ 
 
12
 
 
13
if STATIC_TOOLS
 
14
wpd2text_LDADD = ../../lib/@WPD_OBJDIR@/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.a ../../lib/@WPD_OBJDIR@/libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.a @WPD2TEXT_WIN32_RESOURCE@
 
15
wpd2text_LDFLAGS = -all-static
 
16
else
 
17
wpd2text_LDADD = ../../lib/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.la ../../lib/libwpd-stream-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.la @WPD2TEXT_WIN32_RESOURCE@
 
18
endif
 
19
 
14
20
wpd2text_SOURCES = \
15
21
        TextListenerImpl.cpp \
16
22
        TextListenerImpl.h \
18
24
 
19
25
if OS_WIN32
20
26
 
21
 
@WPD2TEXT_WIN32_RESOURCE@ : wpd2text.rc
22
 
        $(top_srcdir)/build/win32/lt-compile-resource wpd2text.rc @WPD2TEXT_WIN32_RESOURCE@
 
27
@WPD2TEXT_WIN32_RESOURCE@ : wpd2text.rc $(wpd2text_OBJECTS)
 
28
        chmod +x $(top_srcdir)/build/win32/*compile-resource && \
 
29
        WINDRES=@WINDRES@ $(top_srcdir)/build/win32/lt-compile-resource wpd2text.rc @WPD2TEXT_WIN32_RESOURCE@
23
30
endif
24
31
 
25
32
# Include the wpd2text_SOURCES in case we build a tarball without stream
26
33
EXTRA_DIST = \
27
 
        $(wpd2text_SOURCES)     \
 
34
        $(wpd2text_SOURCES) \
28
35
        wpd2text.rc.in
29
36
 
30
37
# These may be in the builddir too