Attachment #200650 for bug #280840

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

Lines 6-13 EXTRA_DIST = install-fonts VeraBd.ttf VeraSeBd.ttf VeraMono.ttf Link Here

(-)a/data/Makefile.am (-2 / +2 lines)
6		6
7	# Install fonts, if they're not installed	7	# Install fonts, if they're not installed
8	install-data-hook:	8	install-data-hook:
9	./install-fonts $(datadir)	9	./install-fonts "$(DESTDIR)$(datadir)"
10		10
11	# Uninstall fonts	11	# Uninstall fonts
12	uninstall-hook:	12	uninstall-hook:
13	rm -rf $(datadir)/xsw/*.ttf	13	rm -rf "$(DESTDIR)$(datadir)"/xsw/*.ttf




xsw_SOURCES=xsw.c options.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \
	          options.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \
		  parser.y lexer.l
xsw_LDADD=$(SDL_LIBS)
xsw_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"

xswconv_SOURCES=xswconv.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \
	                  file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \
		          parser.y lexer.l
xswconv_LDADD=$(SDL_LIBS)
xswconv_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"

#xsw2html_SOURCES=x2h.c x2h_options.c x2h_template.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c util.c \
#		       x2h_options.h x2h_template.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h util.h \
#		       parser.y lexer.l
#xsw2html_LDADD=$(SDL_LIBS)
#xsw2html_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"
- 

Return to bug 280840

Lines 10-26 dist_bin_SCRIPTS=xsw2pdf xsw2png xsw2jpeg Link Here

(-)a/src/Makefile.am (-7 / +6 lines)
10	xsw_SOURCES=xsw.c options.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \	10	xsw_SOURCES=xsw.c options.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \
11	options.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \	11	options.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \
12	parser.y lexer.l	12	parser.y lexer.l
13	xsw_LDADD=$(SDL_LIBS) -L/usr/local/lib	13	xsw_LDADD=$(SDL_LIBS)
14	xsw_CFLAGS=$(SDL_CFLAGS) -I/usr/local/include/SDL -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"	14	xsw_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"
15		15
16	xswconv_SOURCES=xswconv.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \	16	xswconv_SOURCES=xswconv.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c \
17	file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \	17	file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h \
18	parser.y lexer.l	18	parser.y lexer.l
19	xswconv_LDADD=$(SDL_LIBS) -L/usr/local/lib	19	xswconv_LDADD=$(SDL_LIBS)
20	xswconv_CFLAGS=$(SDL_CFLAGS) -I/usr/local/include/SDL -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"	20	xswconv_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"
21		21
22	#xsw2html_SOURCES=x2h.c x2h_options.c x2h_template.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c util.c \	22	#xsw2html_SOURCES=x2h.c x2h_options.c x2h_template.c file.c presentation.c slide.c cmd_text.c cmd_img.c list.c presenter.c execute.c color.c util.c \
23	# x2h_options.h x2h_template.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h util.h \	23	# x2h_options.h x2h_template.h file.h presentation.h slide.h cmd_text.h cmd_img.h list.h presenter.h execute.h color.h util.h \
24	# parser.y lexer.l	24	# parser.y lexer.l
25	#xsw2html_LDADD=$(SDL_LIBS) -L/usr/local/lib	25	#xsw2html_LDADD=$(SDL_LIBS)
26	#xsw2html_CFLAGS=$(SDL_CFLAGS) -I/usr/local/include/SDL -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"	26	#xsw2html_CFLAGS=$(SDL_CFLAGS) -Wall -Wextra -DUSE_SDL -DDATADIR=\""$(DESTDIR)$(datadir)/xsw/"\" -DVERSION=\"$(VERSION)\"
27	-