← Back to branch summary

~siretart/gxine/bug.542506

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-03-21 11:24:59 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080321112459-igb0jy01nytpdrzt
Tags: 0.5.901-1ubuntu1
https://launchpad.net/bugs/204563
https://launchpad.net/bugs/128864
* merge debian changes for hardy PPA. Remaining changes:
  - debian/control: added Xb-Npp-xxx tags accordingly to "firefox distro
    add-on suport" spec,
    (https://blueprints.launchpad.net/ubuntu/+spec/firefox-distro-addon-support)
* Feature Freeze exception granted in LP: #204563
* New upstream release fixes playing DVDs. LP: #128864
* mime.default: add "x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;"
  to get it listed as a player for dvd and video cds in nautilus. Thanks to
  Sebastien Bacher for the hint.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
3
3
INCLUDES = -I../include -I$(top_srcdir)/include -I$(includedir) \
4
4
           -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
5
5
 
6
 
AM_CFLAGS = @GNU99@ $(XINE_CFLAGS) $(X_CFLAGS) \
7
 
            @GTK2_CFLAGS@ @GTHREAD2_CFLAGS@ \
8
 
            @DBUS_CFLAGS@ @JS_CFLAGS@ \
 
6
AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
 
7
            $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
 
8
            $(HAL_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
9
9
            -DLOCALEDIR=\"$(localedir)\"
10
10
 
11
11
bin_PROGRAMS = gxine gxine_client
24
24
        history.c \
25
25
        key_events.c \
26
26
        lirc.c \
 
27
        list_menus.c \
27
28
        log_window.c \
28
29
        main.c \
29
30
        mediamarks.c \
40
41
        settings.c \
41
42
        snapshot.c \
42
43
        stream_info.c \
 
44
        systray.c \
43
45
        ui.c \
44
46
        utils.c \
45
47
        vis.c \
46
48
        wizards.c \
47
49
        xml_widgets.c
48
50
 
49
 
gxine_LDADD = @XINE_LIBS@ @GTK2_LIBS@ @GTHREAD2_LIBS@ \
50
 
              @JS_LIBS@ @DBUS_LIBS@ $(XTEST_LIBS) $(LIRC_LIBS)
51
 
 
52
 
gxine_client_LDADD = $(LDADD) @GLIB2_LIBS@
53
 
 
54
 
gxine_LDFLAGS = $(X_LIBS) $(X_EXTRA_LIBS)
 
51
gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
 
52
              $(JS_LIBS) $(HAL_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
 
53
              $(X_LIBS) $(X_EXTRA_LIBS) $(XTEST_LIBS) $(XINERAMA_LIBS) \
 
54
              $(XCB_LIBS)
55
55
 
56
56
gxine_client_SOURCES = client.c console_output.c
57
57
 
 
58
gxine_client_LDADD = $(LDADD) $(GLIB2_LIBS) $(NET_LIBS)
 
59
 
58
60
mktrans_SOURCES = xml_widgets.c
59
61
 
60
62
mktrans_CFLAGS = -DMAKE_TRANSLATION_SOURCE $(AM_CFLAGS)
61
63
 
62
 
mktrans_LDADD = @XINE_LIBS@ @GLIB2_LIBS@
 
64
mktrans_LDADD = $(XINE_LIBS) $(GLIB2_LIBS) $(INTLLIBS)
63
65
 
64
66
noinst_HEADERS = \
65
67
        console_output.h \
75
77
        info_widgets.h \
76
78
        key_events.h \
77
79
        lirc.h \
 
80
        list_menus.h \
78
81
        log_window.h \
79
82
        mediamarks.h \
80
83
        menu.h \
90
93
        settings.h \
91
94
        snapshot.h \
92
95
        stream_info.h \
 
96
        systray.h \
93
97
        ui.h \
94
98
        utils.h \
95
99
        vis.h \