summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvik/gui
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
commitb77e78eaf3652b80e78ae80f770bd3bdf721363d (patch)
treed3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/texk/xdvik/gui
parentad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff)
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvik/gui')
-rw-r--r--Build/source/texk/xdvik/gui/Makefile.am12
-rw-r--r--Build/source/texk/xdvik/gui/Makefile.in52
-rw-r--r--Build/source/texk/xdvik/gui/Makefile.in.orig83
3 files changed, 46 insertions, 101 deletions
diff --git a/Build/source/texk/xdvik/gui/Makefile.am b/Build/source/texk/xdvik/gui/Makefile.am
index ce61f2c0832..9f0fea5ad5c 100644
--- a/Build/source/texk/xdvik/gui/Makefile.am
+++ b/Build/source/texk/xdvik/gui/Makefile.am
@@ -1,12 +1,16 @@
+## Makefile.am for the TeX Live subdirectory texk/xdvik/gui/
##
-INCLUDES = -I$(top_srcdir)
-INCLUDES += $(PS_DEF)
-INCLUDES += $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES)
-INCLUDES += $(X_CFLAGS)
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+include ../common.am
+
+INCLUDES = -I$(top_srcdir) $(common_includes)
noinst_LIBRARIES = libgui.a
libgui_a_SOURCES = \
+ ../print-internal.c \
Panner.c \
Panner.h \
PannerP.h \
diff --git a/Build/source/texk/xdvik/gui/Makefile.in b/Build/source/texk/xdvik/gui/Makefile.in
index 3762e6649c7..123d5d71995 100644
--- a/Build/source/texk/xdvik/gui/Makefile.in
+++ b/Build/source/texk/xdvik/gui/Makefile.in
@@ -32,11 +32,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+DIST_COMMON = $(srcdir)/../common.am $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
subdir = gui
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-arg-string.m4 \
- $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/xdvi-c-bitmap-type.m4 \
$(top_srcdir)/m4/xdvi-cc-concat.m4 \
$(top_srcdir)/m4/xdvi-find-motif.m4 \
$(top_srcdir)/m4/xdvi-find-xpm.m4 \
@@ -68,9 +68,9 @@ LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
libgui_a_AR = $(AR) $(ARFLAGS)
libgui_a_LIBADD =
-am_libgui_a_OBJECTS = Panner.$(OBJEXT) Tip.$(OBJEXT) \
- help-window.$(OBJEXT) mag.$(OBJEXT) menu.$(OBJEXT) \
- message-window.$(OBJEXT) pagesel.$(OBJEXT) \
+am_libgui_a_OBJECTS = print-internal.$(OBJEXT) Panner.$(OBJEXT) \
+ Tip.$(OBJEXT) help-window.$(OBJEXT) mag.$(OBJEXT) \
+ menu.$(OBJEXT) message-window.$(OBJEXT) pagesel.$(OBJEXT) \
print-dialog.$(OBJEXT) print-log.$(OBJEXT) \
search-dialog.$(OBJEXT) selection.$(OBJEXT) sfDir.$(OBJEXT) \
sfDraw.$(OBJEXT) sfPath.$(OBJEXT) sfSelFile.$(OBJEXT) \
@@ -112,10 +112,6 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -181,7 +177,6 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@@ -234,14 +229,25 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+x_ext_lib = @x_ext_lib@
x_linker_options = @x_linker_options@
x_tool_libs = @x_tool_libs@
x_xmu_lib = @x_xmu_lib@
x_xpm_libs = @x_xpm_libs@
-INCLUDES = -I$(top_srcdir) $(PS_DEF) $(KPATHSEA_INCLUDES) \
- $(T1LIB_INCLUDES) $(X_CFLAGS)
+x_cppflags = $(X_CFLAGS) $(iconv_includes)
+common_includes = $(PS_DEF) $(KPATHSEA_INCLUDES) $(T1LIB_INCLUDES) $(x_cppflags)
+x_ldflags = $(X_LIBS) $(x_linker_options) $(iconv_libpath)
+x_extra_libs = $(X_EXTRA_LIBS) $(iconv_libs)
+xdvi_x_libs = $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt \
+ $(X_PRE_LIBS) $(x_ext_lib) $(x_xpm_libs) -lX11 $(x_extra_libs)
+common_ldadd = $(KPATHSEA_LIBS) $(T1LIB_LIBS) $(xdvi_x_libs)
+common_dependencies = $(KPATHSEA_DEPEND) $(T1LIB_DEPEND)
+libxdvi_dependencies = ${top_srcdir}/*.[ch] ${top_builddir}/psheader.c
+libgui_dependencies = ${top_srcdir}/*.h ${top_srcdir}/print-internal.c ${top_srcdir}/gui/*.[ch]
+INCLUDES = -I$(top_srcdir) $(common_includes)
noinst_LIBRARIES = libgui.a
libgui_a_SOURCES = \
+ ../print-internal.c \
Panner.c \
Panner.h \
PannerP.h \
@@ -313,7 +319,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../common.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -364,6 +370,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message-window.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagesel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-internal.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-log.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search-dialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection.Po@am__quote@
@@ -409,6 +416,20 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+print-internal.o: ../print-internal.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-internal.o -MD -MP -MF $(DEPDIR)/print-internal.Tpo -c -o print-internal.o `test -f '../print-internal.c' || echo '$(srcdir)/'`../print-internal.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-internal.Tpo $(DEPDIR)/print-internal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../print-internal.c' object='print-internal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-internal.o `test -f '../print-internal.c' || echo '$(srcdir)/'`../print-internal.c
+
+print-internal.obj: ../print-internal.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT print-internal.obj -MD -MP -MF $(DEPDIR)/print-internal.Tpo -c -o print-internal.obj `if test -f '../print-internal.c'; then $(CYGPATH_W) '../print-internal.c'; else $(CYGPATH_W) '$(srcdir)/../print-internal.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/print-internal.Tpo $(DEPDIR)/print-internal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../print-internal.c' object='print-internal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print-internal.obj `if test -f '../print-internal.c'; then $(CYGPATH_W) '../print-internal.c'; else $(CYGPATH_W) '$(srcdir)/../print-internal.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -590,6 +611,9 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+@KPATHSEA_RULE@
+@T1LIB_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/Build/source/texk/xdvik/gui/Makefile.in.orig b/Build/source/texk/xdvik/gui/Makefile.in.orig
deleted file mode 100644
index 873f41e92de..00000000000
--- a/Build/source/texk/xdvik/gui/Makefile.in.orig
+++ /dev/null
@@ -1,83 +0,0 @@
-# Makefile for xdvik
-#
-# - 1999/05/08: janl: Removed submakes for libwww and kpathsea. That's what
-# the top makefile is for!
-#
-
-
-### NOTE: ac_include paths must be relative to texk/xdvik, since that
-### is from where the configure is run!
-ac_include ../make/paths.mk
-ac_include ../make/library.mk
-ac_include ../make/common.mk
-ac_include ../make/programs.mk
-
-kpathsea_parent = ../..
-
-# additional flags for kpathsea
-LIBKPATHSEACPPFLAGS=@LIBKPATHSEACPPFLAGS@
-
-CPP = @CPP@
-RANLIB = @RANLIB@
-
-# Make `#include <X11/...>' and `-lX...' work.
-# This matches web2c (needed only for Metafont).
-x_cppflags = @X_CFLAGS@
-
-# Extra xdvi-specific compiler options.
-ps_def = @PS_DEF@ -DXSERVER_INFO
-prog_cflags = @XTRA_WARN_CFLAGS@ $(LIBKPATHSEACPPFLAGS) -I.. -I$(srcdir)/.. $(x_cppflags) $(ps_def)
-
-# Note: to be able to use one depend.mk file for both Motif/Xaw (which
-# is needed since only maintainers are supposed to invoke `make depend')
-# we include *all* object files and have tests for #ifdef MOTIF/XAW inside
-# the files.
-objects = \
- help-window.o \
- message-window.o \
- mag.o \
- menu.o \
- Panner.o \
- pagesel.o \
- print-dialog.o \
- print-log.o \
- search-dialog.o \
- selection.o \
- sfDir.o \
- sfDraw.o \
- sfPath.o \
- sfSelFile.o \
- statusline.o \
- Tip.o \
- topic-window.o \
- xaw_bitmaps.o \
- xaw_menu.o \
- xicon.o \
- xlwradio.o \
- xm_colorsel.o \
- xm_filesel.o \
- xm_menu.o \
- xm_prefs.o \
- xm_prefs_appearance.o \
- xm_prefs_fonts.o \
- xm_prefs_page.o \
- xm_prefs_scroll.o \
- xm_prefs_helpers.o \
- xm_toolbar.o
-
-libgui.a: $(objects)
-### hmm, I don't understand ar ... sometimes objects were NOT replaced.
-### Play it safe and always remove the archive before creating new one.
- rm -f $@
- $(AR) $(ARFLAGS) $@ $(objects)
- $(RANLIB) $@
-
-ac_include ../make/dist.mk
-ac_include ../make/clean.mk
-
-clean::
- rm -f *.o *.a
-
-c_auto_h_dir = ..
-ac_include ../make/rdepend.mk
-ac_include ./gui/depend.mk