408686 - Using glib-genmarshal for generation gtkmozembedmarshal*

Status: RESOLVED FIXED

(Core Graveyard :: Embedding: GTK Widget, defect)

Description

[Oleg Romashin (:romaxa)]

Attachment: Bugfix

gtkmozembed should use glib-genmarshal for auto-generation garbage files gtkmozembedmarshal.c and gtkmozembedmarshal.h

Comment 1

[Doug Turner (:dougt)]

Comment on attachment 293520 [details] [diff] [review]
Bugfix

[e-mail], does this look okay?

Comment 2

[Oleg Romashin (:romaxa)]

Probably gtkmozembedmarshal.c gtkmozembedmarshal.h should be deleted, because is will confuse gtkmozembedmarshal.c make rule

Comment 3

[Benjamin Smedberg]

Comment on attachment 293520 [details] [diff] [review]
Bugfix

>+$(MARSHAL_FILE).h: $(MARSHAL_FILE).list
>+	glib-genmarshal --prefix=$(MARSHAL_PREFIX) $(srcdir)/$(MARSHAL_FILE).list --skip-source --header > $(MARSHAL_FILE).h

Use > $@ instead of > $(MARSHAL_FILE).h, and the same below

And yes, you do need to remove the checked-in marshal file as well.

Comment 4

[Oleg Romashin (:romaxa)]

Attachment: Fixed Use > $@ instead of > $(MARSHAL_FILE).*

Comment 5

[Reed Loden [:reed]]

Checking in embedding/browser/gtk/src/Makefile.in;
/cvsroot/mozilla/embedding/browser/gtk/src/Makefile.in,v  <--  Makefile.in
new revision: 1.76; previous revision: 1.75
done
Removing embedding/browser/gtk/src/gtkmozembedmarshal.c;
/cvsroot/mozilla/embedding/browser/gtk/src/gtkmozembedmarshal.c,v  <--  gtkmozembedmarshal.c
new revision: delete; previous revision: 1.6
done
Removing embedding/browser/gtk/src/gtkmozembedmarshal.h;
/cvsroot/mozilla/embedding/browser/gtk/src/gtkmozembedmarshal.h,v  <--  gtkmozembedmarshal.h
new revision: delete; previous revision: 1.6
done