← Back to branch summary

~ubuntu-branches/ubuntu/utopic/geany/utopic

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2011-12-10 07:43:26 UTC
  • mfrom: (3.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20111210074326-s8yqbew5i20h33tf
Tags: 0.21-1ubuntu1
* Merge from Debian Unstable, remaining changes:
  - debian/patches/20_use_evince_viewer.patch:
     + use evince as viewer for pdf and dvi files
  - debian/patches/20_use_x_terminal_emulator.patch:
     + use x-terminal-emulator as terminal
  - debian/control
     + Add breaks on geany-plugins-common << 0.20
* Also fixes bugs:
  - Filter for MATLAB/Octave files filters everythign (LP: 885505)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
1
1
## Process this file with automake to produce Makefile.in
2
 
# $Id: Makefile.am 5292 2010-10-07 14:10:32Z ntrel $
 
2
# $Id: Makefile.am 5839 2011-06-13 18:41:15Z colombanw $
3
3
 
4
4
 
5
5
EXTRA_DIST = images.c gb.c win32.c win32.h plugindata.h \
74
74
 
75
75
 
76
76
INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \
77
 
                        @GTK_CFLAGS@ @GIO_CFLAGS@
 
77
                        -I$(topsrcdir)/tagmanager/mio @GTK_CFLAGS@ @GTHREAD_CFLAGS@
78
78
 
79
79
# tell automake we have a C++ file so it uses the C++ linker we need for Scintilla
80
80
nodist_EXTRA_geany_SOURCES = dummy.cxx
85
85
 
86
86
geany_SOURCES = $(SRCS) win32.c win32.h
87
87
 
88
 
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ \
89
 
                                $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res
 
88
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
 
89
                                @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 \
 
90
                                geany_private.res
90
91
 
91
92
AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
92
93
                        -DGEANY_DOCDIR=\"\" \
112
113
 
113
114
geany_SOURCES = $(SRCS) vte.c vte.h
114
115
 
115
 
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS)
 
116
geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
 
117
                                @GTK_LIBS@ @GTHREAD_LIBS@ $(INTLLIBS)
116
118
 
117
119
AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
118
120
                        -DGEANY_DOCDIR=\""$(docdir)"\" \