Fixed problems in making the new bonobo translation that confused the

2000-10-18  Rebecca Schulman  <rebecka@eazel.com>
	Fixed problems in making the new bonobo translation
	that confused the headers.  Also added .cvsignore
	entries for the new generated xml files. This should fix
        the tinderbox build

	* components/loser/content/.cvsignore:
	* components/loser/content/Makefile.am:
	* components/loser/sidebar/.cvsignore:
	* components/loser/sidebar/Makefile.am:
	* components/mozilla/.cvsignore:
	* components/mozilla/Makefile.am:
	* components/sample/.cvsignore:
	* components/sample/Makefile.am:
	* icons/.cvsignore:
	* libnautilus/.cvsignore:
	* libnautilus/Makefile.am:
	* src/.cvsignore:
	* src/Makefile.am:
	* src/file-manager/.cvsignore:
	* src/file-manager/Makefile.am:
This commit is contained in:
Rebecca Schulman 2000-10-19 02:45:43 +00:00 committed by Rebecca Schulman
parent 626d17ae59
commit 60951d7f9f
16 changed files with 51 additions and 39 deletions

View file

@ -1,3 +1,24 @@
2000-10-18 Rebecca Schulman <rebecka@eazel.com>
Fixed problems in making the new bonobo translation
that confused the headers. Also added .cvsignore
entries for the new generated xml files.
* components/loser/content/.cvsignore:
* components/loser/content/Makefile.am:
* components/loser/sidebar/.cvsignore:
* components/loser/sidebar/Makefile.am:
* components/mozilla/.cvsignore:
* components/mozilla/Makefile.am:
* components/sample/.cvsignore:
* components/sample/Makefile.am:
* icons/.cvsignore:
* libnautilus/.cvsignore:
* libnautilus/Makefile.am:
* src/.cvsignore:
* src/Makefile.am:
* src/file-manager/.cvsignore:
* src/file-manager/Makefile.am:
2000-10-18 Eskil Heyn Olsen <eskil@eazel.com>
* po/POTFILES.in:
@ -41,6 +62,7 @@
will be used later to handle click drag in background
windows.
>>>>>>> 1.2435
2000-10-18 Ramiro Estrugo <ramiro@eazel.com>
* components/mozilla/nautilus-mozilla-content-view.c:

View file

@ -3,3 +3,4 @@
Makefile
Makefile.in
nautilus-content-loser
nautilus-content-loser-ui.xml.h

View file

@ -20,12 +20,12 @@ oaf_DATA = nautilus-content-loser.oafinfo
uidir = $(datadir)/gnome/ui
ui_DATA = nautilus-content-loser-ui.xml
ui_msgs = nautilus-content-loser-ui.xml.h
ui_msgs = nautilus-content-loser-ui.xml
nautilus-content-loser-ui.xml.h: $(srcdir)/nautilus-content-loser-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-content-loser-ui.xml > \
nautilus-content-loser-ui.xml.h
bin_PROGRAMS = \
nautilus-content-loser

View file

@ -3,3 +3,4 @@
Makefile
Makefile.in
nautilus-sidebar-loser
nautilus-sidebar-loser-ui.xml.h

View file

@ -17,12 +17,12 @@ oaf_DATA = nautilus-sidebar-loser.oafinfo
uidir = $(datadir)/gnome/ui
ui_DATA = nautilus-sidebar-loser-ui.xml
ui_msgs = nautilus-sidebar-loser-ui.xml.h
nautilus-sidebar-loser-ui.xml.h: $(srcdir)/nautilus-sidebar-loser-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-sidebar-loser-ui.xml > \
nautilus-sidebar-loser-ui.xml.h
bin_PROGRAMS = \
nautilus-sidebar-loser
@ -40,8 +40,6 @@ nautilus_sidebar_loser_LDADD = \
$(VFS_LIBS) \
$(OAF_LIBS)
BUILT_SOURCES = $(ui_msgs)
EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
CLEANFILES = $(ui_msgs)

View file

@ -3,3 +3,5 @@
Makefile
Makefile.in
nautilus-mozilla-content-view
nautilus-mozilla-ui.xml.h

View file

@ -59,13 +59,13 @@ ui_DATA = \
nautilus-mozilla-ui.xml \
$(NULL)
ui_msgs = \
nautilus-mozilla-ui.xml.h \
nautilus-mozilla-ui.xml \
$(NULL)
nautilus-mozilla-ui.xml.h: $(srcdir)/nautilus-mozilla-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-mozilla-ui.xml > \
nautilus-mozilla-ui.xml.h
EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
BUILT_SOURCES = $(ui_msgs)

View file

@ -3,3 +3,5 @@
Makefile
Makefile.in
nautilus-sample-content-view
nautilus-sample-content-view-ui.xml.h

View file

@ -16,12 +16,11 @@ oaf_DATA = nautilus-sample-content-view.oafinfo
uidir = $(datadir)/gnome/ui
ui_DATA = nautilus-sample-content-view-ui.xml
ui_msgs = nautilus-sample-content-view-ui.xml.h
nautilus-sample-content-view-ui.xml.h: $(srcdir)/nautilus-sample-content-view-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-sample-content-view-ui.xml > \
nautilus-sample-content-view-ui.xml.h
bin_PROGRAMS = \
nautilus-sample-content-view
@ -38,8 +37,5 @@ nautilus_sample_content_view_LDADD = \
$(VFS_LIBS) \
$(OAF_LIBS)
EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(ui_msgs)
EXTRA_DIST = $(oaf_DATA) $(ui_DATA)
BUILT_SOURCES = $(ui_msgs)
CLEANFILES = $(ui_msgs)

View file

@ -1,2 +1,3 @@
Makefile
Makefile.in
.thumbnails

View file

@ -14,3 +14,4 @@ nautilus-view-component-stubs.c
nautilus-view-component.h
nautilus_distributed_undo_idl_stamp
nautilus_view_component_idl_stamp
nautilus-clipboard-ui.xml.h

View file

@ -35,8 +35,7 @@ nautilus_distributed_undo_idl_sources = \
BUILT_SOURCES = \
$(nautilus_view_component_idl_sources) \
$(nautilus_distributed_undo_idl_sources)\
$(ui_msgs)
$(nautilus_distributed_undo_idl_sources)
libnautilusincludedir=$(includedir)/libnautilus
@ -66,6 +65,7 @@ libnautilus_la_SOURCES= \
$(NULL)
$(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp
nautilus_view_component_idl_stamp: nautilus-view-component.idl
$(ORBIT_IDL) $(IDL_CFLAGS) --define=NAUTILUS_VIEW_COMPONENT_COMPILATION $(srcdir)/nautilus-view-component.idl
touch nautilus_view_component_idl_stamp
@ -79,25 +79,20 @@ CLEANFILES = \
$(nautilus_view_component_idl_sources) \
nautilus_view_component_idl_stamp \
$(nautilus_distributed_undo_idl_sources) \
nautilus_distributed_undo_idl_stamp \
$(ui_msgs)
nautilus_distributed_undo_idl_stamp
uidir = $(datadir)/gnome/ui
ui_DATA = \
nautilus-clipboard-ui.xml \
$(NULL)
ui_msgs = \
nautilus-clipboard-ui.xml.h
nautilus-clipboard-ui.xml.h: $(srcdir)/nautilus-clipboard-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-clipboard-ui.xml > \
nautilus-clipboard-ui.xml.h
EXTRA_DIST = \
$(ui_DATA) \
nautilus-view-component.idl \
nautilus-distributed-undo.idl \
$(ui_msgs) \
$(NULL)

View file

@ -8,3 +8,5 @@ nautilus-shell-interface-skels.c
nautilus-shell-interface-stubs.c
nautilus-shell-interface.h
nautilus_shell_interface_idl_stamp
nautilus-shell-ui.xml.h

View file

@ -43,7 +43,7 @@ nautilus_shell_interface_idl_sources = \
nautilus-shell-interface.h \
nautilus-shell-interface-common.c
BUILT_SOURCES = $(nautilus_shell_interface_idl_sources) $(ui_msgs)
BUILT_SOURCES = $(nautilus_shell_interface_idl_sources)
if ENABLE_PROFILER
profiler_headers = nautilus-profiler.h
@ -150,9 +150,6 @@ ui_DATA = \
nautilus-service-ui.xml \
nautilus-shell-ui.xml \
$(NULL)
ui_msgs = \
nautilus-shell-ui.xml.h \
$(NULL)
nautilus-shell-ui.xml.h: nautilus-shell-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-shell-ui.xml > \
@ -161,7 +158,6 @@ nautilus-shell-ui.xml.h: nautilus-shell-ui.xml
CLEANFILES = \
$(nautilus_shell_interface_idl_sources) \
nautilus_shell_interface_idl_stamp \
$(ui_msgs)
$(NULL)
EXTRA_DIST = \
@ -170,7 +166,6 @@ EXTRA_DIST = \
$(oaf_DATA) \
run-nautilus \
$(ui_DATA) \
$(ui_msgs) \
$(NULL)
install-data-hook: run-nautilus

View file

@ -4,3 +4,6 @@
*.lo
Makefile
Makefile.in
nautilus-directory-view-ui.xml.h
nautilus-icon-view-ui.xml.h
nautilus-search-list-view-ui.xml.h

View file

@ -51,15 +51,8 @@ ui_DATA = \
nautilus-icon-view-ui.xml \
nautilus-search-list-view-ui.xml \
$(NULL)
ui_msgs = \
nautilus-directory-view-ui.xml.h \
nautilus-icon-view-ui.xml.h \
nautilus-search-list-view-ui.xml.h \
$(NULL)
BUILT_SOURCES = $(ui_msgs)
CLEANFILES = $(ui_msgs)
nautilus-directory-view-ui.xml.h: $(srcdir)/nautilus-directory-view-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-directory-view-ui.xml > \
@ -70,6 +63,6 @@ nautilus-icon-view-ui.xml.h: $(srcdir)/nautilus-icon-view-ui.xml
nautilus-search-list-view-ui.xml.h: $(srcdir)/nautilus-search-list-view-ui.xml
$(BONOBO_UI_EXTRACT) $(srcdir)/nautilus-search-list-view-ui.xml >\
nautilus-search-list-view-ui.xml.h
EXTRA_DIST = $(ui_DATA) $(ui_msgs)
EXTRA_DIST = $(ui_DATA)