[DVIPDFMx] dvipdfmx/src/Makefile.am

[Karl Berry]

Can you please make this change to src/Makefile.am?  It reformats the
list of sources, and updates the hook definitions.  Then at least we
will be able to keep the long list of source files in sync.

Also, if you could rename the top-level configure.in to configure.ac,
that would be one less difference.

Peter made many other changes to the config system as part of his
general cleanup, but I'm not sure they can easily be imported back.
I'll let him comment on that.

Thanks,
Karl

--- dvipdfmx-20100328/src/Makefile.am	2009-05-10 19:04:54.000000000 +0200
+++ dx/src/Makefile.am	2010-04-05 02:24:56.000000000 +0200
@@ -1,25 +1,40 @@
 bin_PROGRAMS = dvipdfmx
-dvipdfmx_SOURCES = agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
-cmap.c cmap_read.c cmap_write.c cs_type2.c \
-dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
-dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c mfileio.c mpost.c \
-numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c pdfdraw.c pdfencoding.c \
-pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c pdfresource.c pdfximage.c \
-pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \
-spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c spc_tpic.c spc_util.c specials.c \
-subfont.c tfm.c \
-tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c truetype.c \
-type0.c t1_char.c t1_load.c type1.c type1c.c \
-unicode.c vf.c xbb.c \
-agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h cff_types.h \
-cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h cmap_p.h cmap_read.h cmap_write.h \
-cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h dvicodes.h dvipdfmx.h epdf.h error.h fontmap.h \
-jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h otl_opt.h pdfcolor.h pdfdev.h \
-pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h pdflimits.h pdfnames.h pdfobj.h \
-pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h pst_obj.h sfnt.h \
-spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h spc_tpic.h spc_util.h specials.h \
-subfont.h system.h tfm.h \
-tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h truetype.h \
-type0.h t1_char.h t1_load.h type1.h type1c.h \
-unicode.h vf.h xbb.h
+dist_bin_SCRIPTS = dvipdft
+dvipdfmx_SOURCES = \
+	agl.c bmpimage.c cff.c cff_dict.c cid.c cidtype0.c cidtype2.c \
+	cmap.c cmap_read.c cmap_write.c cs_type2.c \
+	dpxconf.c dpxcrypt.c dpxfile.c dpxutil.c \
+	dvi.c dvipdfmx.c epdf.c error.c fontmap.c jpegimage.c mem.c \
+	mfileio.c mpost.c \
+	numbers.c otl_conf.c otl_opt.c pdfcolor.c pdfdev.c pdfdoc.c \
+	pdfdraw.c pdfencoding.c \
+	pdfencrypt.c pdffont.c pdfnames.c pdfobj.c pdfparse.c \
+	pdfresource.c pdfximage.c \
+	pkfont.c pngimage.c pst.c pst_obj.c sfnt.c \
+	spc_color.c spc_dvips.c spc_html.c spc_misc.c spc_pdfm.c \
+	spc_tpic.c spc_util.c specials.c \
+	subfont.c tfm.c \
+	tt_aux.c tt_cmap.c tt_glyf.c tt_gsub.c tt_post.c tt_table.c \
+	truetype.c \
+	type0.c t1_char.c t1_load.c type1.c type1c.c \
+	unicode.c vf.c xbb.c \
+	agl.h bmpimage.h cff.h cff_dict.h cff_limits.h cff_stdstr.h \
+	cff_types.h \
+	cid.h cid_basefont.h cid_p.h cidtype0.h cidtype2.h cmap.h \
+	cmap_p.h cmap_read.h cmap_write.h \
+	cs_type2.h dpxconf.h dpxcrypt.h dpxutil.h dpxfile.h dvi.h \
+	dvicodes.h dvipdfmx.h epdf.h error.h fontmap.h \
+	jpegimage.h mem.h mfileio.h mpost.h numbers.h otl_conf.h \
+	otl_opt.h pdfcolor.h pdfdev.h \
+	pdfdoc.h pdfdraw.h pdfencoding.h pdfencrypt.h pdffont.h \
+	pdflimits.h pdfnames.h pdfobj.h \
+	pdfparse.h pdfresource.h pdfximage.h pkfont.h pngimage.h pst.h \
+	pst_obj.h sfnt.h \
+	spc_color.h spc_dvips.h spc_html.h spc_misc.h spc_pdfm.h \
+	spc_tpic.h spc_util.h specials.h \
+	subfont.h system.h tfm.h \
+	tt_aux.h tt_cmap.h tt_glyf.h tt_gsub.h tt_post.h tt_table.h \
+	truetype.h \
+	type0.h t1_char.h t1_load.h type1.h type1c.h \
+	unicode.h vf.h xbb.h
 
@@ -41,3 +56,11 @@
 install-exec-hook:
-	cd $(DESTDIR)$(bindir) && rm -f ebb && $(LN_S) dvipdfmx ebb
-	cd $(DESTDIR)$(bindir) && rm -f extractbb && $(LN_S) dvipdfmx extractbb
+	cd $(DESTDIR)$(bindir) && \
+	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
+	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
+	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT) && \
+	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT)
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)