summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd
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/libs/gd
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/libs/gd')
-rw-r--r--Build/source/libs/gd/Makefile.am13
-rw-r--r--Build/source/libs/gd/Makefile.in8
-rw-r--r--Build/source/libs/gd/ac/gd.ac6
-rw-r--r--Build/source/libs/gd/ac/withenable.ac6
4 files changed, 19 insertions, 14 deletions
diff --git a/Build/source/libs/gd/Makefile.am b/Build/source/libs/gd/Makefile.am
index c972c77881e..5b043bd13a4 100644
--- a/Build/source/libs/gd/Makefile.am
+++ b/Build/source/libs/gd/Makefile.am
@@ -22,10 +22,9 @@ dist-hook:
INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
if build
-
noinst_LIBRARIES=libgd.a
-
endif build
+EXTRA_LIBRARIES=libgd.a
nodist_libgd_a_SOURCES = \
$(GD_TREE)/gd.c \
@@ -72,15 +71,15 @@ BUILT_SOURCES = \
jisx0208.h \
wbmp.h
-$(BUILT_SOURCES): stamp-gd
-
-libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
+$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
## Rebuild zlib
@ZLIB_RULE@
## Rebuild libpng
@LIBPNG_RULE@
+$(BUILT_SOURCES): stamp-gd
+
stamp-gd:
@for file in $(BUILT_SOURCES); do \
test -f $$file || { \
@@ -92,7 +91,3 @@ stamp-gd:
distclean-local:
rm -f stamp-gd $(BUILT_SOURCES)
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig configure.in.orig
-
diff --git a/Build/source/libs/gd/Makefile.in b/Build/source/libs/gd/Makefile.in
index 2d8d22b862e..f9b9ea79940 100644
--- a/Build/source/libs/gd/Makefile.in
+++ b/Build/source/libs/gd/Makefile.in
@@ -190,9 +190,10 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(GD_TREE) Makefile.in.orig configure.in.orig
+EXTRA_DIST = $(GD_TREE)
INCLUDES = -I$(top_srcdir)/$(GD_TREE) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
@build_TRUE@noinst_LIBRARIES = libgd.a
+EXTRA_LIBRARIES = libgd.a
nodist_libgd_a_SOURCES = \
$(GD_TREE)/gd.c \
$(GD_TREE)/gd_gd.c \
@@ -238,7 +239,6 @@ BUILT_SOURCES = \
jisx0208.h \
wbmp.h
-libgd_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1037,11 +1037,13 @@ uninstall-am:
dist-hook:
rm -rf `find $(distdir)/$(GD_TREE) -name .svn`
-$(BUILT_SOURCES): stamp-gd
+$(libgd_a_OBJECTS): $(BUILT_SOURCES) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
@ZLIB_RULE@
@LIBPNG_RULE@
+$(BUILT_SOURCES): stamp-gd
+
stamp-gd:
@for file in $(BUILT_SOURCES); do \
test -f $$file || { \
diff --git a/Build/source/libs/gd/ac/gd.ac b/Build/source/libs/gd/ac/gd.ac
index 97242870e1b..6b297620e9f 100644
--- a/Build/source/libs/gd/ac/gd.ac
+++ b/Build/source/libs/gd/ac/gd.ac
@@ -1,3 +1,7 @@
-## libs/gd/ac/gd.ac
+## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
## define required functions and headers from system gd
KPSE_CHECK_LIB([gd], [gdImageCreate], [gd.h])
diff --git a/Build/source/libs/gd/ac/withenable.ac b/Build/source/libs/gd/ac/withenable.ac
index 24637010b52..be03732231b 100644
--- a/Build/source/libs/gd/ac/withenable.ac
+++ b/Build/source/libs/gd/ac/withenable.ac
@@ -1,3 +1,7 @@
-## libs/gd/kpse/withenable.ac
+## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
## configure options and TL libraries required for gd
KPSE_WITH_LIB([gd], [libpng])