Attachment #244081 for bug #333953

View | Details | Raw Unified | Return to bug 333953
Collapse All | Expand All

Lines 30-39 Link Here

(-)gtk+extra-2.1.2.orig/configure.in (-4 / +4 lines)
30	AC_SUBST(GTK_EXTRA_VERSION)	30	AC_SUBST(GTK_EXTRA_VERSION)
31		31
32	# libtool versioning	32	# libtool versioning
33	LT_CURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`	33	LTCURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
34	LT_REVISION=$GTK_EXTRA_INTERFACE_AGE	34	LTREVISION=$GTK_EXTRA_INTERFACE_AGE
35	LT_AGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`	35	LTAGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
36	LIBGTKEXTRA_SO_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE	36	LIBGTKEXTRA_SO_VERSION=$LTCURRENT:$LTREVISION:$LTAGE
37	AC_SUBST(LIBGTKEXTRA_SO_VERSION)	37	AC_SUBST(LIBGTKEXTRA_SO_VERSION)
38		38
39	# For automake	39	# For automake




	-version-info $(LIBGTKEXTRA_SO_VERSION)    \
	-export-dynamic                                         \
	-rpath $(libdir)                                        \
	$(no_undefined)

LDADD = \
	$(GTK_LIBS)                                             

#



gtkextra_public_h_sources = \
	gtkbordercombo.h 	\
	gtkcharsel.h	\
	gtkcheckitem.h	\
	gtkcolorcombo.h	\
	gtkcombobutton.h	\
	gtkdirtree.h	\
	gtkextra.h	\
	gtkextrafeatures.h	\
	gtkextraicons.h	\
	gtkextra-marshal.h	\
	gtkextratypebuiltins.h	\
	gtkfilelist.h	\
	gtkfileicons.h	\
	gtkfontcombo.h	\
	gtkiconfilesel.h	\
	gtkiconlist.h	\
	gtkitementry.h	\
	gtkplot.h	\
	gtkplotarray.h	\
	gtkplot3d.h	\
	gtkplotdt.h	\
	gtkplotpolar.h	\
	gtkplotdata.h	\
	gtkplotpixmap.h	\
	gtkplotbar.h	\
	gtkplotbox.h	\
	gtkplotbubble.h	\
	gtkplotcandle.h	\
	gtkplotflux.h	\
	gtkplotsurface.h	\
	gtkplotcsurface.h	\
	gtkplotcanvas.h	\
	gtkplotpc.h	\
	gtkplotgdk.h	\
	gtkplotps.h	\
	gtkplotprint.h	\
	gtkplotsegment.h	\
	gtkpsfont.h	\
	gtksheet.h	\
	gtktogglecombo.h	\
	gtkplotcanvasline.h \
	gtkplotcanvasrectangle.h \
	gtkplotcanvasellipse.h \
	gtkplotcanvastext.h \
	gtkplotcanvaspixmap.h \
	gtkplotcanvasplot.h 

gtkextra_c_sources = 	\
	gtkbordercombo.c	\
	gtkcharsel.c	\
	gtkcheckitem.c	\
	gtkcolorcombo.c	\
	gtkcombobutton.c	\
	gtkdirtree.c	\
	gtkextra.c	\
	gtkextra-marshal.c	\
	gtkextratypebuiltins.c	\
	gtkfilelist.c	\
	gtkfontcombo.c	\
	gtkiconlist.c	\
	gtkitementry.c	\
	gtkiconfilesel.c	\
	gtkplot.c	\
	gtkplotarray.c	\
	gtkplot3d.c	\
	gtkplotdt.c	\
	gtkplotpolar.c	\
	gtkplotdata.c	\
	gtkplotpixmap.c \
	gtkplotbar.c	\
	gtkplotbox.c	\
	gtkplotbubble.c	\
	gtkplotcandle.c	\
	gtkplotflux.c	\
	gtkplotsurface.c	\
	gtkplotcsurface.c	\
	gtkplotcanvas.c	\
	gtkplotpc.c	\
	gtkplotgdk.c	\
	gtkplotps.c	\
	gtkplotprint.c	\
	gtkplotsegment.c	\
	gtkpsfont.c	\
	gtksheet.c	\
	gtktogglecombo.c \
	gtkplotcanvasline.c \
	gtkplotcanvasrectangle.c \
	gtkplotcanvasellipse.c \
	gtkplotcanvastext.c \
	gtkplotcanvaspixmap.c \
	gtkplotcanvasplot.c 

gtkextra_private_h_sources = \
	icons.h \

$(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}

$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
	|| ( rm -f gtkextra-marshal.tmp && exit 1 )
$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
	|| ( rm -f gtkextra-marshal.tmp && exit 1 )


$(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)

Return to bug 333953

Lines 54-60 Link Here

(-)gtk+extra-2.1.2.orig/gtkextra/Makefile.am (-96 / +98 lines)
54	-version-info $(LIBGTKEXTRA_SO_VERSION) \	54	-version-info $(LIBGTKEXTRA_SO_VERSION) \
55	-export-dynamic \	55	-export-dynamic \
56	-rpath $(libdir) \	56	-rpath $(libdir) \
57	$(no_undefined) \	57	$(no_undefined)
		58
		59	LDADD = \
58	$(GTK_LIBS)	60	$(GTK_LIBS)
59		61
60	#	62	#
Lines 63-159 Link Here
63		65
64		66
65	gtkextra_public_h_sources = \	67	gtkextra_public_h_sources = \
66	gtkbordercombo.h \	68	gtkbordercombo.h \
67	gtkcharsel.h \	69	gtkcharsel.h \
68	gtkcheckitem.h \	70	gtkcheckitem.h \
69	gtkcolorcombo.h \	71	gtkcolorcombo.h \
70	gtkcombobutton.h \	72	gtkcombobutton.h \
71	gtkdirtree.h \	73	gtkdirtree.h \
72	gtkextra.h \	74	gtkextra.h \
73	gtkextrafeatures.h \	75	gtkextrafeatures.h \
74	gtkextraicons.h \	76	gtkextraicons.h \
75	gtkextra-marshal.h \	77	gtkextra-marshal.h \
76	gtkextratypebuiltins.h \	78	gtkextratypebuiltins.h \
77	gtkfilelist.h \	79	gtkfilelist.h \
78	gtkfileicons.h \	80	gtkfileicons.h \
79	gtkfontcombo.h \	81	gtkfontcombo.h \
80	gtkiconfilesel.h \	82	gtkiconfilesel.h \
81	gtkiconlist.h \	83	gtkiconlist.h \
82	gtkitementry.h \	84	gtkitementry.h \
83	gtkplot.h \	85	gtkplot.h \
84	gtkplotarray.h \	86	gtkplotarray.h \
85	gtkplot3d.h \	87	gtkplot3d.h \
86	gtkplotdt.h \	88	gtkplotdt.h \
87	gtkplotpolar.h \	89	gtkplotpolar.h \
88	gtkplotdata.h \	90	gtkplotdata.h \
89	gtkplotpixmap.h \	91	gtkplotpixmap.h \
90	gtkplotbar.h \	92	gtkplotbar.h \
91	gtkplotbox.h \	93	gtkplotbox.h \
92	gtkplotbubble.h \	94	gtkplotbubble.h \
93	gtkplotcandle.h \	95	gtkplotcandle.h \
94	gtkplotflux.h \	96	gtkplotflux.h \
95	gtkplotsurface.h \	97	gtkplotsurface.h \
96	gtkplotcsurface.h \	98	gtkplotcsurface.h \
97	gtkplotcanvas.h \	99	gtkplotcanvas.h \
98	gtkplotpc.h \	100	gtkplotpc.h \
99	gtkplotgdk.h \	101	gtkplotgdk.h \
100	gtkplotps.h \	102	gtkplotps.h \
101	gtkplotprint.h \	103	gtkplotprint.h \
102	gtkplotsegment.h \	104	gtkplotsegment.h \
103	gtkpsfont.h \	105	gtkpsfont.h \
104	gtksheet.h \	106	gtksheet.h \
105	gtktogglecombo.h \	107	gtktogglecombo.h \
106	gtkplotcanvasline.h \	108	gtkplotcanvasline.h \
107	gtkplotcanvasrectangle.h \	109	gtkplotcanvasrectangle.h \
108	gtkplotcanvasellipse.h \	110	gtkplotcanvasellipse.h \
109	gtkplotcanvastext.h \	111	gtkplotcanvastext.h \
110	gtkplotcanvaspixmap.h \	112	gtkplotcanvaspixmap.h \
111	gtkplotcanvasplot.h	113	gtkplotcanvasplot.h
112		114
113	gtkextra_c_sources = \	115	gtkextra_c_sources = \
114	gtkbordercombo.c \	116	gtkbordercombo.c \
115	gtkcharsel.c \	117	gtkcharsel.c \
116	gtkcheckitem.c \	118	gtkcheckitem.c \
117	gtkcolorcombo.c \	119	gtkcolorcombo.c \
118	gtkcombobutton.c \	120	gtkcombobutton.c \
119	gtkdirtree.c \	121	gtkdirtree.c \
120	gtkextra.c \	122	gtkextra.c \
121	gtkextra-marshal.c \	123	gtkextra-marshal.c \
122	gtkextratypebuiltins.c \	124	gtkextratypebuiltins.c \
123	gtkfilelist.c \	125	gtkfilelist.c \
124	gtkfontcombo.c \	126	gtkfontcombo.c \
125	gtkiconlist.c \	127	gtkiconlist.c \
126	gtkitementry.c \	128	gtkitementry.c \
127	gtkiconfilesel.c \	129	gtkiconfilesel.c \
128	gtkplot.c \	130	gtkplot.c \
129	gtkplotarray.c \	131	gtkplotarray.c \
130	gtkplot3d.c \	132	gtkplot3d.c \
131	gtkplotdt.c \	133	gtkplotdt.c \
132	gtkplotpolar.c \	134	gtkplotpolar.c \
133	gtkplotdata.c \	135	gtkplotdata.c \
134	gtkplotpixmap.c \	136	gtkplotpixmap.c \
135	gtkplotbar.c \	137	gtkplotbar.c \
136	gtkplotbox.c \	138	gtkplotbox.c \
137	gtkplotbubble.c \	139	gtkplotbubble.c \
138	gtkplotcandle.c \	140	gtkplotcandle.c \
139	gtkplotflux.c \	141	gtkplotflux.c \
140	gtkplotsurface.c \	142	gtkplotsurface.c \
141	gtkplotcsurface.c \	143	gtkplotcsurface.c \
142	gtkplotcanvas.c \	144	gtkplotcanvas.c \
143	gtkplotpc.c \	145	gtkplotpc.c \
144	gtkplotgdk.c \	146	gtkplotgdk.c \
145	gtkplotps.c \	147	gtkplotps.c \
146	gtkplotprint.c \	148	gtkplotprint.c \
147	gtkplotsegment.c \	149	gtkplotsegment.c \
148	gtkpsfont.c \	150	gtkpsfont.c \
149	gtksheet.c \	151	gtksheet.c \
150	gtktogglecombo.c \	152	gtktogglecombo.c \
151	gtkplotcanvasline.c \	153	gtkplotcanvasline.c \
152	gtkplotcanvasrectangle.c \	154	gtkplotcanvasrectangle.c \
153	gtkplotcanvasellipse.c \	155	gtkplotcanvasellipse.c \
154	gtkplotcanvastext.c \	156	gtkplotcanvastext.c \
155	gtkplotcanvaspixmap.c \	157	gtkplotcanvaspixmap.c \
156	gtkplotcanvasplot.c	158	gtkplotcanvasplot.c
157		159
158	gtkextra_private_h_sources = \	160	gtkextra_private_h_sources = \
159	icons.h \	161	icons.h \
Lines 197-209 Link Here
197	$(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}	199	$(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
198		200
199	$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list	201	$(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
200	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \	202	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
201	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \	203	&& mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
202	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )	204	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )
203	$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h	205	$(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
204	( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \	206	( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
205	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \	207	&& mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
206	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )	208	\|\| ( rm -f gtkextra-marshal.tmp && exit 1 )
207		209
208		210
209	$(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)	211	$(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)