diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 08:08:51 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-07-01 08:08:51 +0000 |
commit | 6dbfce345ce1137d12b8bd2179d4ab634a8c7c07 (patch) | |
tree | b33f81b782475b2f110a946a43b6619b074b0312 /Build/source/texk/dvipdfm-x/Makefile.am | |
parent | b38c5ab240b45ff1b15f9c61306dc7cc65e17d4e (diff) |
dvipdfm-x: Always first include <config.h>
Merge dvipdfmx and xdvipdfmx (continued)
git-svn-id: svn://tug.org/texlive/trunk@31056 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipdfm-x/Makefile.am')
-rw-r--r-- | Build/source/texk/dvipdfm-x/Makefile.am | 74 |
1 files changed, 51 insertions, 23 deletions
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 7d2d6f08d84..e763c515388 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -5,24 +5,13 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -SUBDIRS = data bin_PROGRAMS = -bin_links = - if DVIPDFMX -SUBDIRS += man bin_PROGRAMS += dvipdfmx -if WIN32 -noinst_PROGRAMS = call_dvipdfmx -else !WIN32 +if !WIN32 dist_bin_SCRIPTS = dvipdft endif !WIN32 -bin_links += \ - dvipdfmx$(EXEEXT):dvipdfm \ - dvipdfmx$(EXEEXT):ebb \ - dvipdfmx$(EXEEXT):extractbb endif DVIPDFMX - if XDVIPDFMX bin_PROGRAMS += xdvipdfmx endif XDVIPDFMX @@ -39,8 +28,7 @@ nodist_xdvipdfmx_SOURCES = $(common_sources) $(xdvipdfmx_sources) dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) -$(dvipdfmx_OBJECTS): config.force -$(xdvipdfmx_OBJECTS): config.force $(FREETYPE2_DEPEND) +$(dvipdfmx_OBJECTS) $(xdvipdfmx_OBJECTS): config.force common_sources = \ agl.c \ @@ -69,7 +57,11 @@ common_sources = \ dpxconf.h \ dpxcrypt.c \ dpxcrypt.h \ + dpxutil.c \ + dpxutil.h \ dvicodes.h \ + error.c \ + error.h \ mem.c \ mem.h \ mfileio.c \ @@ -134,16 +126,12 @@ dvipdfmx_sources = \ src/cidtype2.c \ src/dpxfile.c \ src/dpxfile.h \ - src/dpxutil.c \ - src/dpxutil.h \ src/dvi.c \ src/dvi.h \ src/dvipdfmx.c \ dvipdfmx.h \ src/epdf.c \ src/epdf.h \ - src/error.c \ - src/error.h \ src/fontmap.c \ src/fontmap.h \ src/jpegimage.c \ @@ -202,15 +190,11 @@ xdvipdfmx_sources = \ xsrc/cidtype2.c \ xsrc/dpxfile.c \ xsrc/dpxfile.h \ - xsrc/dpxutil.c \ - xsrc/dpxutil.h \ xsrc/dvi.c \ xsrc/dvi.h \ xsrc/dvipdfmx.c \ xsrc/epdf.c \ xsrc/epdf.h \ - xsrc/error.c \ - xsrc/error.h \ xsrc/fontmap.c \ xsrc/fontmap.h \ xsrc/jpegimage.c \ @@ -264,11 +248,52 @@ xdvipdfmx_sources = \ EXTRA_DIST = $(common_sources) $(dvipdfmx_sources) $(xdvipdfmx_sources) +## Links +## +bin_links = + +if DVIPDFMX +if WIN32 +noinst_PROGRAMS = call_dvipdfmx +endif WIN32 +bin_links += \ + dvipdfmx$(EXEEXT):dvipdfm \ + dvipdfmx$(EXEEXT):ebb \ + dvipdfmx$(EXEEXT):extractbb +endif DVIPDFMX + call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" nodist_call_dvipdfmx_SOURCES = callexe.c include $(srcdir)/../am/bin_links.am +## Manpages +## +# Note: dvipdft.1 used here needs to be updated +# and dvipdfm.1 be replaced by dvipdfmx.1 with a link to dvipdfm.1 + +man1_links = +if DVIPDFMX +dist_man1_MANS = man/dvipdfm.1 man/dvipdft.1 man/extractbb.1 +man1_links += extractbb:ebb +endif DVIPDFMX + +include $(srcdir)/../am/man1_links.am + +## Data +## +configdatadir = $(datarootdir)/texmf-dist/dvipdfmx +dist_configdata_DATA = data/dvipdfmx.cfg + +glyphlistdatadir = $(datarootdir)/texmf-dist/fonts/map/glyphlist +dist_glyphlistdata_DATA = data/glyphlist.txt data/pdfglyphlist.txt + +mapdatadir = $(datarootdir)/texmf-dist/fonts/map/dvipdfmx +dist_mapdata_DATA = data/cid-x.map + +cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx +dist_cmapdata_DATA = data/EUC-UCS2 + install-exec-hook: install-bin-links if DVIPDFMX if WIN32 @@ -278,7 +303,9 @@ if WIN32 endif WIN32 endif DVIPDFMX -uninstall-hook: uninstall-bin-links +install-data-hook: install-man1-links + +uninstall-hook: uninstall-bin-links uninstall-man1-links if DVIPDFMX if WIN32 rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT) @@ -305,6 +332,7 @@ DISTCLEANFILES = config.force @ZLIB_RULE@ ## Tests +## TESTS = if DVIPDFMX TESTS += dvipdfmx.test |