This patch makes the .server file be installed with the version as part of the file name, and cleans up some of the other makefile rules, so that the generated files get cleaned up more properly, and the xml ui file generation gets merged into one rule for all of the xml ui files. We also don't need to dist the generated server/xml files, as they will get regenerated at build time anyway. -- dobey
Index: components/html-editor/Makefile.am =================================================================== RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v retrieving revision 1.93 diff -u -r1.93 Makefile.am --- components/html-editor/Makefile.am 22 Sep 2003 21:45:58 -0000 1.93 +++ components/html-editor/Makefile.am 2 Oct 2003 15:43:12 -0000 @@ -154,7 +154,10 @@ serverdir = $(libdir)/bonobo/servers server_in_files = GNOME_GtkHTML_Editor.server.in.in -server_DATA = $(server_in_files:.server.in.in=.server) +server_DATA = $(server_in_files:.server.in.in=-$(EDITOR_API_VERSION).server) +%-$(EDITOR_API_VERSION).server: %.server + mv $< $@ + %.server.in: %.server.in.in Makefile sed -e "s|\ GNOME_GTKHTML_EDITOR_LOCATION\@|$(location)|g" \ -e "s|\ EDITOR_API_VERSION\@|$(EDITOR_API_VERSION)|g" \ @@ -162,15 +165,13 @@ @INTLTOOL_SERVER_RULE@ -GNOME_GtkHTML_Editor.xml: GNOME_GtkHTML_Editor.xml.in Makefile - sed -e 's|\ ICONSDIR\@|$(gtkhtml_data)/icons|g' $< > $@ +uidir = $(gtkhtml_data) +ui_in_files = GNOME_GtkHTML_Editor.xml.in GNOME_GtkHTML_Editor-emacs.xml.in +ui_DATA = $(ui_in_files:.xml.in:=.xml) -GNOME_GtkHTML_Editor-emacs.xml: GNOME_GtkHTML_Editor-emacs.xml.in Makefile +%.xml: %.xml.in sed -e 's|\ ICONSDIR\@|$(gtkhtml_data)/icons|g' $< > $@ -uidir = $(gtkhtml_data) -ui_DATA = GNOME_GtkHTML_Editor.xml GNOME_GtkHTML_Editor-emacs.xml - # The Test program test_editor_SOURCES = \ @@ -188,20 +189,18 @@ $(IDLS) \ $(SPELL_IDLS) \ ChangeLog \ - $(ui_DATA) \ - GNOME_GtkHTML_Editor.xml.in \ - GNOME_GtkHTML_Editor-emacs.xml.in \ gtkhtml-editor-properties.glade \ - $(server_in_files) $(server_DATA) + $(ui_in_files) \ + $(server_in_files) + idldir = $(gtkhtml_data) idl_DATA = $(IDLS) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) -BUILT_SOURCES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED) $(server_DATA) +BUILT_SOURCES = $(IDL_GENERATED) $(SPELL_IDL_GENERATED) $(server_DATA) $(ui_DATA) CLEANFILES = \ - GNOME_GtkHTML_Editor.xml \ - GNOME_GtkHTML_Editor-emacs.xml \ $(BUILT_SOURCES) +
Attachment:
signature.asc
Description: Questa parte del messaggio =?ISO-8859-1?Q?=E8?= firmata