Attachment #30192 for bug #49218

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

Lines 2-8 Link Here

(-)gtkhtml-3.0.9.orig/a11y/Makefile.am (-1 / +1 lines)
2		2
3	INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS)	3	INCLUDES = -I$(top_srcdir)/src $(GTKHTML_CFLAGS)
4		4
5	CFLAGS += $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1	5	CFLAGS += $(GAIL_CFLAGS)
6		6
7	lib_LTLIBRARIES = libgtkhtml-a11y-3.0.la	7	lib_LTLIBRARIES = libgtkhtml-a11y-3.0.la
8		8

Lines 50-56 Link Here

(-)gtkhtml-3.0.9.orig/a11y/Makefile.in (-1 / +1 lines)
50	CC = @CC@	50	CC = @CC@
51	CCDEPMODE = @CCDEPMODE@	51	CCDEPMODE = @CCDEPMODE@
52		52
53	CFLAGS = @CFLAGS@ $(GAIL_CFLAGS) -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1 -DGNOME_DISABLE_DEPRECATED=1	53	CFLAGS = @CFLAGS@ $(GAIL_CFLAGS)
54	CPP = @CPP@	54	CPP = @CPP@
55	CPPFLAGS = @CPPFLAGS@	55	CPPFLAGS = @CPPFLAGS@
56	CYGPATH_W = @CYGPATH_W@	56	CYGPATH_W = @CYGPATH_W@




        -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
	-DGLADE_DATADIR=\"$(gladedir)\"			\
	-DGTK_DISABLE_DEPRECATED=1 			\
	-DGDK_DISABLE_DEPRECATED=1			\
	-DG_DISABLE_DEPRECATED=1			\
	-DGNOME_DISABLE_DEPRECATED=1			\
	-DPREFIX=\""$(prefix)"\"			\
	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
	-DDATADIR=\""$(datadir)"\"			\
	-DLIBDIR=\""$(datadir)"\"			\
	-DBONOBO_DISABLE_DEPRECATED=1

# CORBA stuff
IDLS = Editor.idl




        -DGTKHTML_DATADIR=\""$(gtkhtml_data)"\"		\
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
	-DGLADE_DATADIR=\"$(gladedir)\"			\
	-DGTK_DISABLE_DEPRECATED=1 			\
	-DGDK_DISABLE_DEPRECATED=1			\
	-DG_DISABLE_DEPRECATED=1			\
	-DGNOME_DISABLE_DEPRECATED=1			\
	-DPREFIX=\""$(prefix)"\"			\
	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
	-DDATADIR=\""$(datadir)"\"			\
	-DLIBDIR=\""$(datadir)"\"			\
	-DBONOBO_DISABLE_DEPRECATED=1


# CORBA stuff

Lines 12-21 Link Here

(-)gtkhtml-3.0.9.orig/src/Makefile.am (-4 lines)
12		12
13	AM_CFLAGS = \	13	AM_CFLAGS = \
14	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\" \	14	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\" \
15	-DGTK_DISABLE_DEPRECATED=1 \
16	-DGDK_DISABLE_DEPRECATED=1 \
17	-DG_DISABLE_DEPRECATED=1 \
18	-DGNOME_DISABLE_DEPRECATED=1
19		15
20	lib_LTLIBRARIES = libgtkhtml-3.0.la	16	lib_LTLIBRARIES = libgtkhtml-3.0.la
21		17

Lines 193-202 Link Here

(-)gtkhtml-3.0.9.orig/src/Makefile.in (-4 lines)
193		193
194	AM_CFLAGS = \	194	AM_CFLAGS = \
195	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\" \	195	-DICONDIR=\"$(datadir)/gtkhtml-@GTKHTML_RELEASE@/icons\" \
196	-DGTK_DISABLE_DEPRECATED=1 \
197	-DGDK_DISABLE_DEPRECATED=1 \
198	-DG_DISABLE_DEPRECATED=1 \
199	-DGNOME_DISABLE_DEPRECATED=1
200		196
201		197
202	lib_LTLIBRARIES = libgtkhtml-3.0.la	198	lib_LTLIBRARIES = libgtkhtml-3.0.la

Return to bug 49218

Lines 16-30 Link Here

(-)gtkhtml-3.0.9.orig/components/html-editor/Makefile.am (-5 lines)
16	-DGTKHTML_DATADIR=\""$(gtkhtml_data)"\" \	16	-DGTKHTML_DATADIR=\""$(gtkhtml_data)"\" \
17	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \	17	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
18	-DGLADE_DATADIR=\"$(gladedir)\" \	18	-DGLADE_DATADIR=\"$(gladedir)\" \
19	-DGTK_DISABLE_DEPRECATED=1 \
20	-DGDK_DISABLE_DEPRECATED=1 \
21	-DG_DISABLE_DEPRECATED=1 \
22	-DGNOME_DISABLE_DEPRECATED=1 \
23	-DPREFIX=\""$(prefix)"\" \	19	-DPREFIX=\""$(prefix)"\" \
24	-DSYSCONFDIR=\""$(sysconfdir)"\" \	20	-DSYSCONFDIR=\""$(sysconfdir)"\" \
25	-DDATADIR=\""$(datadir)"\" \	21	-DDATADIR=\""$(datadir)"\" \
26	-DLIBDIR=\""$(datadir)"\" \	22	-DLIBDIR=\""$(datadir)"\" \
27	-DBONOBO_DISABLE_DEPRECATED=1
28		23
29	# CORBA stuff	24	# CORBA stuff
30	IDLS = Editor.idl	25	IDLS = Editor.idl