#include <gnome.h> issues
- From: Johannes Schmid <johannes schmid gmx de>
- To: gnome-devtools gnome org
- Subject: #include <gnome.h> issues
- Date: Wed, 05 Dec 2001 22:19:31 +0100
Hi!
I had some spare time, so I looked at the TODO list and noticed the
point to replace <gnome.h> with more specific include files. So I
started working. It's know great think but I hope this will improve
compilation speed a bit.
Johannes
Index: libanjuta/anjuta-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/libanjuta/anjuta-tool.c,v
retrieving revision 1.8
diff -r1.8 anjuta-tool.c
21d20
< #include <gnome.h>
Index: libanjuta/anjuta-utils.c
===================================================================
RCS file: /cvs/gnome/anjuta2/libanjuta/anjuta-utils.c,v
retrieving revision 1.17
diff -r1.17 anjuta-utils.c
36a37,41
> #include <libgnomeui/gnome-dialog.h>
> #include <libgnomeui/gnome-dialog-util.h>
> #include <libgnomeui/gnome-messagebox.h>
> #include <libgnomeui/gnome-stock.h>
> #include <libgnome/gnome-i18n.h>
Index: libanjuta/anjuta-utils.h
===================================================================
RCS file: /cvs/gnome/anjuta2/libanjuta/anjuta-utils.h,v
retrieving revision 1.10
diff -r1.10 anjuta-utils.h
22,23d21
< #include <gnome.h>
<
Index: plugins/calculator/calculator-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/calculator/calculator-tool.c,v
retrieving revision 1.7
diff -r1.7 calculator-tool.c
9c9
< #include <gnome.h>
---
> #include <libgnomeui/gnome-calculator.h>
Index: plugins/debugger/debugger-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/debugger/debugger-tool.c,v
retrieving revision 1.13
diff -r1.13 debugger-tool.c
5d4
< #include <gnome.h>
Index: plugins/document-manager/anjuta-document-manager-obj.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/anjuta-document-manager-obj.c,v
retrieving revision 1.8
diff -r1.8 anjuta-document-manager-obj.c
21d20
< #include <gnome.h>
Index: plugins/document-manager/anjuta-document-manager.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/anjuta-document-manager.c,v
retrieving revision 1.10
diff -r1.10 anjuta-document-manager.c
24c24
< #include <gnome.h>
---
> #include <gtk/gtknotebook.h>
Index: plugins/document-manager/anjuta-document-manager.h
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/anjuta-document-manager.h,v
retrieving revision 1.6
diff -r1.6 anjuta-document-manager.h
22a23
> #include <gtk/gtknotebook.h>
24d24
< #include <gnome.h>
Index: plugins/document-manager/document-manager-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/document-manager/document-manager-tool.c,v
retrieving revision 1.12
diff -r1.12 document-manager-tool.c
4d3
< #include <gnome.h>
Index: plugins/files/files-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/files/files-tool.c,v
retrieving revision 1.9
diff -r1.9 files-tool.c
10,11c10
<
< #include <gnome.h>
---
> #include <gtk/gtkctree.h>
Index: plugins/functions/parser.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/functions/parser.c,v
retrieving revision 1.2
diff -r1.2 parser.c
20d19
< #include <gnome.h>
Index: plugins/functions/parser.h
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/functions/parser.h,v
retrieving revision 1.2
diff -r1.2 parser.h
22a23,24
> #include <glib.h>
>
Index: plugins/functions/protogen.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/functions/protogen.c,v
retrieving revision 1.4
diff -r1.4 protogen.c
20c20,26
< #include <gnome.h>
---
> #include <gtk/gtkeditable.h>
> #include <gtk/gtkbox.h>
> #include <gtk/gtkentry.h>
> #include <gtk/gtktogglebutton.h>
> #include <libgnomeui/gnome-dialog.h>
>
>
Index: plugins/help/help-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/help/help-tool.c,v
retrieving revision 1.8
diff -r1.8 help-tool.c
9d8
< #include <gnome.h>
Index: plugins/project-manager/project-tool.c
===================================================================
RCS file: /cvs/gnome/anjuta2/plugins/project-manager/project-tool.c,v
retrieving revision 1.22
diff -r1.22 project-tool.c
5d4
< #include <gnome.h>
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/anjuta2/po/ChangeLog,v
retrieving revision 1.25
diff -r1.25 ChangeLog
0a1,14
> <<<<<<< ChangeLog
> <<<<<<< ChangeLog
> 2001-11-16 gettextize <bug-gnu-utils gnu org>
>
> * Makefile.in.in: Upgrade to gettext-0.10.36.
>
> <<<<<<< ChangeLog
> 2001-11-09 gettextize <bug-gnu-utils gnu org>
>
> * Makefile.in.in: Upgrade to gettext-0.10.36.
>
> =======
> =======
> =======
4a19
> >>>>>>> 1.25
9a25
> >>>>>>> 1.24
13a30
> >>>>>>> 1.23
Index: po/Makefile.in.in
===================================================================
RCS file: /cvs/gnome/anjuta2/po/Makefile.in.in,v
retrieving revision 1.6
diff -r1.6 Makefile.in.in
2c2
< # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
---
> # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper gnu ai mit edu>
22c22
< datadir = $(prefix)/@DATADIRNAME@
---
> datadir = $(prefix)/share
24d23
< gnulocaledir = $(prefix)/share/locale
28,29d26
< DESTDIR =
<
32c29,30
< MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
---
> MKINSTALLDIRS = @MKINSTALLDIRS@
> mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
36c34
< GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
---
> GMSGFMT = @GMSGFMT@
38c36
< XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
---
> XGETTEXT = @XGETTEXT@
41c39
<
---
>
54d51
< SOURCES = cat-id-tbl.c
58c55
< stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
---
> $(POFILES) $(GMOFILES)
63,64d59
< CATOBJEXT = @CATOBJEXT@
< INSTOBJEXT = @INSTOBJEXT@
67c62
< .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
---
> .SUFFIXES: .c .o .po .pox .gmo .mo
81,85c76
< && rm -f $$file && $(GMSGFMT) -o $$file $<
<
< .po.cat:
< sed -f ../intl/po2msg.sed < $< > $*.msg \
< && rm -f $@ && $(GENCAT) $@ $*.msg
---
> && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
90c81
< all-yes: cat-id-tbl.c $(CATALOGS)
---
> all-yes: $(CATALOGS)
93,94c84,86
< $(srcdir)/$(PACKAGE).pot: $(POTFILES)
< $(GENPOT)
---
> # Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
> # otherwise packages like GCC can not be built if only parts of the source
> # have been downloaded.
96,108c88,89
< $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
< $(srcdir)/stamp-cat-id: $(PACKAGE).pot
< rm -f cat-id-tbl.tmp
< sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
< | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
< if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
< rm cat-id-tbl.tmp; \
< else \
< echo cat-id-tbl.c changed; \
< rm -f $(srcdir)/cat-id-tbl.c; \
< mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
< fi
< cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
---
> $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
> $(GENPOT)
114,117c95,98
< install-data-no: all
< install-data-yes: all
< if test -r "$(MKINSTALLDIRS)"; then \
< $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
---
> if test "$(PACKAGE)" = "gettext"; then \
> $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
> $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
> $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
119c100
< $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
---
> : ; \
120a102,104
> install-data-no: all
> install-data-yes: all
> $(mkinstalldirs) $(DESTDIR)$(datadir)
124,134c108,110
< case "$$cat" in \
< *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
< *) destdir=$(DESTDIR)$(localedir);; \
< esac; \
< lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
< dir=$$destdir/$$lang/LC_MESSAGES; \
< if test -r "$(MKINSTALLDIRS)"; then \
< $(MKINSTALLDIRS) $$dir; \
< else \
< $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
< fi; \
---
> lang=`echo $$cat | sed 's/\.gmo$$//'`; \
> dir=$(localedir)/$$lang/LC_MESSAGES; \
> $(mkinstalldirs) $(DESTDIR)$$dir; \
136,137c112,113
< $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
< echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
---
> $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
> echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
139c115
< $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
---
> $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
141,154c117
< "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
< fi; \
< if test -r $$cat.m; then \
< $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
< echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
< else \
< if test -r $(srcdir)/$$cat.m ; then \
< $(INSTALL_DATA) $(srcdir)/$$cat.m \
< $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
< echo "installing $(srcdir)/$$cat as" \
< "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
< else \
< true; \
< fi; \
---
> "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
157,167d119
< if test "$(PACKAGE)" = "gettext"; then \
< if test -r "$(MKINSTALLDIRS)"; then \
< $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
< else \
< $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
< fi; \
< $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
< $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
< else \
< : ; \
< fi
176,180c128,129
< lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
< rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
< rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
< rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
< rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
---
> lang=`echo $$cat | sed 's/\.gmo$$//'`; \
> rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
182c131,135
< rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
---
> if test "$(PACKAGE)" = "gettext"; then \
> rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
> else \
> : ; \
> fi
186,187d138
< cat-id-tbl.o: ../intl/libgettext.h
<
191c142
< rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
---
> rm -f core core.* *.pox $(PACKAGE).po *.new.po
197c148
< rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
---
> rm -f Makefile Makefile.in POTFILES *.mo
205c156,160
< dist distdir: update-po $(DISTFILES)
---
> dist distdir:
> $(MAKE) update-po
> @$(MAKE) dist2
> # This is a separate target because 'update-po' must be executed before.
> dist2: $(DISTFILES)
208,209c163
< ln $(srcdir)/$$file $(distdir) 2> /dev/null \
< || cp -p $(srcdir)/$$file $(distdir); \
---
> cp -p $(srcdir)/$$file $(distdir); \
214c168
< PATH=`pwd`/../src:$$PATH; \
---
> if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
216c170
< catalogs='$(CATALOGS)'; \
---
> catalogs='$(GMOFILES)'; \
219c173
< lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
---
> lang=`echo $$cat | sed 's/\.gmo$$//'`; \
222,223c176,177
< if $(MSGMERGE) $$lang; then \
< rm -f $$lang.old.po; \
---
> if $(MSGMERGE) $$lang ; then \
> rm -f $$lang.old.po; \
226c180
< mv $$lang.old.po $$lang.po; \
---
> mv $$lang.old.po $$lang.po; \
228a183
> $(MAKE) update-gmo
241a197,199
>
> update-gmo: Makefile $(GMOFILES)
> @:
Index: src/anjuta.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/anjuta.c,v
retrieving revision 1.36
diff -r1.36 anjuta.c
20c20,23
< #include <gnome.h>
---
>
> #include <gtk/gtkwindow.h>
> #include <libgnomeui/gnome-app.h>
>
Index: src/e-splash.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/e-splash.c,v
retrieving revision 1.3
diff -r1.3 e-splash.c
28c28,32
< #include <gnome.h>
---
> #include <libgnomeui/gnome-canvas.h>
> #include <gtk/gtkframe.h>
> #include <gtk/gtkmain.h>
> #include <gtk/gtksignal.h>
>
Index: src/shell.c
===================================================================
RCS file: /cvs/gnome/anjuta2/src/shell.c,v
retrieving revision 1.10
diff -r1.10 shell.c
21d20
< #include <gnome.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
