[PATCH xts] Build blowup
Peter Harris
pharris at opentext.com
Tue Dec 18 09:44:55 PST 2012
Rename from pixval/blowup to bin/xts-blowup, add Makefile.am, and
delete old-style Makefile.
---
Was blowup really not ported to the new build system yet, or is there
some alternative tool that people use these days?
configure.ac | 1 +
xts5/src/Makefile.am | 2 +-
xts5/src/bin/Makefile.am | 2 +-
xts5/src/bin/blowup/.gitignore | 1 +
xts5/src/bin/blowup/Makefile.am | 7 +++
xts5/src/{pixval => bin}/blowup/ajax.c | 0
xts5/src/{pixval => bin}/blowup/vblowup_c.c | 4 +-
xts5/src/pixval/blowup/.cvsignore | 1 -
xts5/src/pixval/blowup/Makefile | 76 ---------------------------
9 files changed, 13 insertions(+), 81 deletions(-)
create mode 100644 xts5/src/bin/blowup/.gitignore
create mode 100644 xts5/src/bin/blowup/Makefile.am
rename xts5/src/{pixval => bin}/blowup/ajax.c (100%)
rename xts5/src/{pixval => bin}/blowup/vblowup_c.c (99%)
delete mode 100644 xts5/src/pixval/blowup/.cvsignore
delete mode 100644 xts5/src/pixval/blowup/Makefile
delete mode 100644 xts5/src/pixval/include/Dummy
delete mode 100644 xts5/src/pixval/pvtools/Dummy
diff --git a/configure.ac b/configure.ac
index d08b759..57e88df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,7 @@ xts5/src/libXtaw/Makefile
xts5/src/libXtTest/Makefile
xts5/src/xim/Makefile
xts5/src/bin/Makefile
+xts5/src/bin/blowup/Makefile
xts5/src/bin/mc/Makefile
xts5/src/bin/reports/Makefile
xts5/fonts/Makefile
diff --git a/xts5/src/Makefile.am b/xts5/src/Makefile.am
index 7bd74fd..a59493e 100644
--- a/xts5/src/Makefile.am
+++ b/xts5/src/Makefile.am
@@ -1,4 +1,4 @@
-#SUBDIRS = lib libproto libXR5 libXtaw libXtmu libXtTest pixval xim
+#SUBDIRS = lib libproto libXR5 libXtaw libXtmu libXtTest xim
SUBDIRS = lib libproto libXR5 libXtaw libXtTest xim bin
xtslibdir = $(libexecdir)/xts5
diff --git a/xts5/src/bin/Makefile.am b/xts5/src/bin/Makefile.am
index a3edbda..aaf9e75 100644
--- a/xts5/src/bin/Makefile.am
+++ b/xts5/src/bin/Makefile.am
@@ -1 +1 @@
-SUBDIRS = mc reports
+SUBDIRS = blowup mc reports
diff --git a/xts5/src/bin/blowup/.gitignore b/xts5/src/bin/blowup/.gitignore
new file mode 100644
index 0000000..51eec4e
--- /dev/null
+++ b/xts5/src/bin/blowup/.gitignore
@@ -0,0 +1 @@
+xts-blowup
diff --git a/xts5/src/bin/blowup/Makefile.am b/xts5/src/bin/blowup/Makefile.am
new file mode 100644
index 0000000..732bf1e
--- /dev/null
+++ b/xts5/src/bin/blowup/Makefile.am
@@ -0,0 +1,7 @@
+include ../../../common.mk
+
+AM_CFLAGS = -I$(top_srcdir)/xts5/include $(XTS_CFLAGS)
+AM_LDFLAGS = $(XTS_LIBS)
+
+bin_PROGRAMS = xts-blowup
+xts_blowup_SOURCES = ajax.c vblowup_c.c
diff --git a/xts5/src/pixval/blowup/ajax.c b/xts5/src/bin/blowup/ajax.c
similarity index 100%
rename from xts5/src/pixval/blowup/ajax.c
rename to xts5/src/bin/blowup/ajax.c
diff --git a/xts5/src/pixval/blowup/vblowup_c.c b/xts5/src/bin/blowup/vblowup_c.c
similarity index 99%
rename from xts5/src/pixval/blowup/vblowup_c.c
rename to xts5/src/bin/blowup/vblowup_c.c
index 9412e5e..a7eedfc 100644
--- a/xts5/src/pixval/blowup/vblowup_c.c
+++ b/xts5/src/bin/blowup/vblowup_c.c
@@ -273,6 +273,8 @@ SOFTWARE.
#endif
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include "X11/Xlib.h" /* xlib defs */
#include "X11/cursorfont.h" /* cursor info */
/* #include "drawutil.h" // color thingys */
@@ -527,8 +529,6 @@ void (*expose_handler)();
int *winzoomp;
char *font_name;
{
- extern void free();
- extern char *malloc();
int show_color = compare_color;
Font fid;
diff --git a/xts5/src/pixval/blowup/.cvsignore b/xts5/src/pixval/blowup/.cvsignore
deleted file mode 100644
index 2d11e27..0000000
--- a/xts5/src/pixval/blowup/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-blowup
diff --git a/xts5/src/pixval/blowup/Makefile b/xts5/src/pixval/blowup/Makefile
deleted file mode 100644
index 71d74c5..0000000
--- a/xts5/src/pixval/blowup/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2005 X.Org Foundation LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-# Copyright (c) Applied Testing and Technology, Inc. 1995
-# All Rights Reserved.
-# Copyright 1990, 1991 by the Massachusetts Institute of Technology and
-# UniSoft Group Limited.
-#
-# Project: VSW5
-#
-# File: src/bin/pixval/blowup/Makefile
-#
-# Description:
-# Makefile for blowup utility
-#
-# Modifications:
-# $Log: Makefile,v $
-# Revision 1.1 2005-02-12 15:14:15 anderson
-# Initial revision
-#
-# Revision 8.0 1998/12/23 23:25:19 mar
-# Branch point for Release 5.0.2
-#
-# Revision 7.0 1998/10/30 22:43:33 mar
-# Branch point for Release 5.0.2b1
-#
-# Revision 6.0 1998/03/02 05:17:40 tbr
-# Branch point for Release 5.0.1
-#
-# Revision 5.0 1998/01/26 03:14:12 tbr
-# Branch point for Release 5.0.1b1
-#
-# Revision 4.0 1995/12/15 08:44:30 tbr
-# Branch point for Release 5.0.0
-#
-# Revision 3.1 1995/12/15 00:42:15 andy
-# Prepare for GA Release
-#
-
-CFILES=ajax.c vblowup_c.c
-OFILES=ajax.o vblowup_c.o
-RM_FILES=*.o blowup core
-
-blowup: $(OFILES)
- $(CC) $(LDFLAGS) -o $@ $(OFILES) $(PORTLIB) $(SYSLIBS) $(SYSMATHLIB)
-
-install: blowup
- $(CP) blowup $(XTESTBIN)
-
-clean:
- $(RM) $(RM_FILES)
-
-lint:
- $(LINT) $(LINTFLAGS) $(CFILES)
-
-doc:
- ctodoc $(CFILES) > $$TET_ROOT/../doc/blowupraw.mm
diff --git a/xts5/src/pixval/include/Dummy b/xts5/src/pixval/include/Dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/xts5/src/pixval/pvtools/Dummy b/xts5/src/pixval/pvtools/Dummy
deleted file mode 100644
index e69de29..0000000
--
1.7.2.5
More information about the xorg-devel
mailing list