← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
47
47
        $(UNITY_LIBS) \
48
48
        $(NULL)
49
49
 
 
50
dbus_built_sources = nautilus-freedesktop-generated.c nautilus-freedesktop-generated.h
 
51
$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-dbus-interfaces.xml
 
52
        gdbus-codegen                                                                   \
 
53
                --interface-prefix org.freedesktop.                                     \
 
54
                --c-namespace NautilusFreedesktop                                       \
 
55
                --c-generate-object-manager                                             \
 
56
                --generate-c-code nautilus-freedesktop-generated                        \
 
57
                $(top_srcdir)/data/freedesktop-dbus-interfaces.xml                      \
 
58
                $(NULL)
 
59
 
 
60
UI_FILES = \
 
61
        nautilus-bookmarks-window.ui            \
 
62
        nautilus-file-management-properties.ui  \
 
63
        nautilus-icon-view-ui.xml               \
 
64
        nautilus-toolbar-ui.xml                 \
 
65
        nautilus-directory-view-ui.xml          \
 
66
        nautilus-desktop-icon-view-ui.xml       \
 
67
        nautilus-desktop-window-ui.xml          \
 
68
        nautilus-list-view-ui.xml               \
 
69
        nautilus-shell-ui.xml                   \
 
70
        $(NULL)
 
71
 
 
72
nautilus-resources.c: nautilus.gresource.xml $(UI_FILES)
 
73
        glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name nautilus $(srcdir)/nautilus.gresource.xml
 
74
 
 
75
nautilus-resources.h: nautilus.gresource.xml
 
76
        glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name nautilus $(srcdir)/nautilus.gresource.xml
 
77
 
 
78
 
 
79
BUILT_SOURCES = \
 
80
        $(dbus_built_sources) \
 
81
        nautilus-resources.c \
 
82
        nautilus-resources.h \
 
83
        $(NULL)
 
84
 
50
85
nautilus_SOURCES = \
51
86
        nautilus-actions.h                      \
52
87
        nautilus-application.c                  \
72
107
        nautilus-file-management-properties.h   \
73
108
        nautilus-floating-bar.c                 \
74
109
        nautilus-floating-bar.h                 \
 
110
        nautilus-freedesktop-dbus.c             \
 
111
        nautilus-freedesktop-dbus.h             \
75
112
        nautilus-icon-view.c                    \
76
113
        nautilus-icon-view.h                    \
77
114
        nautilus-icon-view-container.c          \
151
188
        unity-bookmarks-handler.h               \
152
189
        $(NULL)
153
190
 
 
191
nodist_nautilus_SOURCES = \
 
192
        $(BUILT_SOURCES) \
 
193
        $(NULL)
 
194
 
154
195
EMPTY_VIEW_SOURCES = \
155
196
        nautilus-empty-view.c                   \
156
197
        nautilus-empty-view.h
181
222
 
182
223
@INTLTOOL_SERVER_RULE@
183
224
 
184
 
uidir = $(datadir)/nautilus/ui
185
 
ui_DATA =                                       \
186
 
        nautilus-shell-ui.xml                   \
187
 
        nautilus-file-management-properties.ui  \
188
 
        nautilus-bookmarks-window.ui            \
189
 
        nautilus-desktop-icon-view-ui.xml       \
190
 
        nautilus-desktop-window-ui.xml  \
191
 
        nautilus-directory-view-ui.xml          \
192
 
        nautilus-icon-view-ui.xml               \
193
 
        nautilus-list-view-ui.xml               \
194
 
        nautilus-toolbar-ui.xml                 \
195
 
        $(NULL)
196
 
 
197
225
CLEANFILES = \
 
226
        $(BUILT_SOURCES)                        \
198
227
        $(server_DATA)                          \
199
228
        $(NULL)
200
229
 
201
230
EXTRA_DIST =                                    \
202
231
        $(server_in_files)                      \
203
 
        $(ui_DATA)                              \
 
232
        $(UI_FILES)                             \
 
233
        nautilus.gresource.xml                  \
204
234
        check-nautilus                          \
205
235
        $(NULL)
206
236