summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-05-19 15:02:48 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-05-19 15:02:48 +0000
commit2cc1896c61eef5739bb6a8ffa89e58ba5c175a05 (patch)
treec35aba25e7027ae060d3349f37d00474338591f6 /src
parentcf0d69c7ace679f27f105c582760b9be14923aba (diff)
- Add build system for lib/XpmXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10
- Add Xpm to symlink.sh - Conditionally include config.h in xc/extras/Xpm
Diffstat (limited to 'src')
-rw-r--r--src/Attrib.c3
-rw-r--r--src/CrBufFrI.c3
-rw-r--r--src/CrBufFrP.c3
-rw-r--r--src/CrDatFrI.c3
-rw-r--r--src/CrDatFrP.c3
-rw-r--r--src/CrIFrBuf.c3
-rw-r--r--src/CrIFrDat.c3
-rw-r--r--src/CrIFrP.c3
-rw-r--r--src/CrPFrBuf.c3
-rw-r--r--src/CrPFrDat.c3
-rw-r--r--src/CrPFrI.c3
-rw-r--r--src/Image.c3
-rw-r--r--src/Info.c3
-rw-r--r--src/Makefile.am46
-rw-r--r--src/RdFToBuf.c3
-rw-r--r--src/RdFToDat.c3
-rw-r--r--src/RdFToI.c3
-rw-r--r--src/RdFToP.c3
-rw-r--r--src/WrFFrBuf.c3
-rw-r--r--src/WrFFrDat.c3
-rw-r--r--src/WrFFrI.c3
-rw-r--r--src/WrFFrP.c3
-rw-r--r--src/amigax.c3
-rw-r--r--src/create.c3
-rw-r--r--src/data.c3
-rw-r--r--src/hashtab.c3
-rw-r--r--src/misc.c3
-rw-r--r--src/parse.c3
-rw-r--r--src/rgb.c3
-rw-r--r--src/scan.c3
-rw-r--r--src/simx.c3
31 files changed, 136 insertions, 0 deletions
diff --git a/src/Attrib.c b/src/Attrib.c
index 028c2cb..c6b34d6 100644
--- a/src/Attrib.c
+++ b/src/Attrib.c
@@ -34,6 +34,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
/* 3.2 backward compatibility code */
diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c
index 66b2f45..b879715 100644
--- a/src/CrBufFrI.c
+++ b/src/CrBufFrI.c
@@ -36,6 +36,9 @@
/* $XFree86$ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
LFUNC(WriteColors, int, (char **dataptr, unsigned int *data_size,
diff --git a/src/CrBufFrP.c b/src/CrBufFrP.c
index 4aec4fb..44eb56d 100644
--- a/src/CrBufFrP.c
+++ b/src/CrBufFrP.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c
index 37e7f8c..9099966 100644
--- a/src/CrDatFrI.c
+++ b/src/CrDatFrI.c
@@ -35,6 +35,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size,
diff --git a/src/CrDatFrP.c b/src/CrDatFrP.c
index 1593b7b..20981b7 100644
--- a/src/CrDatFrP.c
+++ b/src/CrDatFrP.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/CrIFrBuf.c b/src/CrIFrBuf.c
index ba863ac..d98e658 100644
--- a/src/CrIFrBuf.c
+++ b/src/CrIFrBuf.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
LFUNC(OpenBuffer, void, (char *buffer, xpmData *mdata));
diff --git a/src/CrIFrDat.c b/src/CrIFrDat.c
index f3c19c7..ab93a49 100644
--- a/src/CrIFrDat.c
+++ b/src/CrIFrDat.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
LFUNC(OpenArray, void, (char **data, xpmData *mdata));
diff --git a/src/CrIFrP.c b/src/CrIFrP.c
index f8aa4ed..144acc4 100644
--- a/src/CrIFrP.c
+++ b/src/CrIFrP.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
void
diff --git a/src/CrPFrBuf.c b/src/CrPFrBuf.c
index 19e7cb9..f3f9030 100644
--- a/src/CrPFrBuf.c
+++ b/src/CrPFrBuf.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/CrPFrDat.c b/src/CrPFrDat.c
index fcbe5f1..483b3af 100644
--- a/src/CrPFrDat.c
+++ b/src/CrPFrDat.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/CrPFrI.c b/src/CrPFrI.c
index 0661a4e..2f555dd 100644
--- a/src/CrPFrI.c
+++ b/src/CrPFrI.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
void
diff --git a/src/Image.c b/src/Image.c
index 0753622..2179d4e 100644
--- a/src/Image.c
+++ b/src/Image.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
/*
diff --git a/src/Info.c b/src/Info.c
index 9bc41c8..f35abd9 100644
--- a/src/Info.c
+++ b/src/Info.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
/*
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..658307d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,46 @@
+# Daniel Stone disowns all copyright on this file.
+
+lib_LTLIBRARIES=libXpm.la
+
+AM_CFLAGS = -I. \
+ -I$(top_srcdir)/include/X11/ \
+ $(XPM_CFLAGS)
+
+libXpm_la_LDFLAGS = -version-number 4:5:1 -no-undefined
+libXpm_la_LIBADD = $(XPM_LIBS)
+
+libXpm_la_SOURCES = \
+ Attrib.c \
+ CrBufFrI.c \
+ CrBufFrP.c \
+ CrDatFrI.c \
+ CrDatFrP.c \
+ CrIFrBuf.c \
+ CrIFrDat.c \
+ CrIFrP.c \
+ CrPFrBuf.c \
+ CrPFrDat.c \
+ CrPFrI.c \
+ Image.c \
+ Info.c \
+ RdFToBuf.c \
+ RdFToDat.c \
+ RdFToI.c \
+ RdFToP.c \
+ WrFFrBuf.c \
+ WrFFrDat.c \
+ WrFFrI.c \
+ WrFFrP.c \
+ XpmI.h \
+ create.c \
+ data.c \
+ hashtab.c \
+ misc.c \
+ parse.c \
+ rgb.c \
+ rgbtab.h \
+ scan.c \
+ simx.h
+
+libXpmincludedir = $(includedir)/X11
+libXpminclude_HEADERS = $(top_srcdir)/include/X11/xpm.h
diff --git a/src/RdFToBuf.c b/src/RdFToBuf.c
index f6ad75d..222bf18 100644
--- a/src/RdFToBuf.c
+++ b/src/RdFToBuf.c
@@ -39,6 +39,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#include <sys/stat.h>
#if !defined(FOR_MSW) && !defined(WIN32)
diff --git a/src/RdFToDat.c b/src/RdFToDat.c
index 4bb28fc..11f753b 100644
--- a/src/RdFToDat.c
+++ b/src/RdFToDat.c
@@ -32,6 +32,9 @@
* Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/RdFToI.c b/src/RdFToI.c
index e91d5e9..d7a6af1 100644
--- a/src/RdFToI.c
+++ b/src/RdFToI.c
@@ -35,6 +35,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#ifndef NO_ZPIPE
#include <fcntl.h>
diff --git a/src/RdFToP.c b/src/RdFToP.c
index 212d260..993824e 100644
--- a/src/RdFToP.c
+++ b/src/RdFToP.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/WrFFrBuf.c b/src/WrFFrBuf.c
index a206b5c..9e0497a 100644
--- a/src/WrFFrBuf.c
+++ b/src/WrFFrBuf.c
@@ -34,6 +34,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/WrFFrDat.c b/src/WrFFrDat.c
index bfaa909..bc0a944 100644
--- a/src/WrFFrDat.c
+++ b/src/WrFFrDat.c
@@ -32,6 +32,9 @@
* Developed by Dan Greening dgreen@cs.ucla.edu / dgreen@sti.com *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/WrFFrI.c b/src/WrFFrI.c
index c280641..363f6c4 100644
--- a/src/WrFFrI.c
+++ b/src/WrFFrI.c
@@ -38,6 +38,9 @@
* Lorens Younes (d93-hyo@nada.kth.se) 4/96
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#ifndef NO_ZPIPE
diff --git a/src/WrFFrP.c b/src/WrFFrP.c
index b78ea0c..87ceb88 100644
--- a/src/WrFFrP.c
+++ b/src/WrFFrP.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
int
diff --git a/src/amigax.c b/src/amigax.c
index aa82d49..eb3bc3a 100644
--- a/src/amigax.c
+++ b/src/amigax.c
@@ -33,6 +33,9 @@
* Revised 4/96 *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#include "amigax.h"
diff --git a/src/create.c b/src/create.c
index 8bf9d2e..abc9d59 100644
--- a/src/create.c
+++ b/src/create.c
@@ -47,6 +47,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#include <ctype.h>
diff --git a/src/data.c b/src/data.c
index cfd1007..d0b86ee 100644
--- a/src/data.c
+++ b/src/data.c
@@ -43,6 +43,9 @@ static char *RCS_Version = "$XpmVersion: 3.4k $";
/* Internal version number */
static char *RCS_Id = "Id: xpm.shar,v 3.71 1998/03/19 19:47:14 lehors Exp $";
#endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#endif
#include <ctype.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index f5a71dd..d2383a4 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -33,6 +33,9 @@
* *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
diff --git a/src/misc.c b/src/misc.c
index ce80d54..d842e0e 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -32,6 +32,9 @@
* Developed by Arnaud Le Hors *
\*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#ifdef NEED_STRDUP
diff --git a/src/parse.c b/src/parse.c
index 73ed6b2..e7b3378 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -43,6 +43,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#include <ctype.h>
#include <string.h>
diff --git a/src/rgb.c b/src/rgb.c
index b26ee3f..0a5af8b 100644
--- a/src/rgb.c
+++ b/src/rgb.c
@@ -42,6 +42,9 @@
* W. Snitily but has been modified for my special need
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#include <ctype.h>
diff --git a/src/scan.c b/src/scan.c
index 28191e8..e8e4c27 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -45,6 +45,9 @@
/* October 2004, source code review by Thomas Biege <thomas@suse.de> */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "XpmI.h"
#define MAXPRINTABLE 92 /* number of printable ascii chars
diff --git a/src/simx.c b/src/simx.c
index 5e5537d..97b3b5f 100644
--- a/src/simx.c
+++ b/src/simx.c
@@ -35,6 +35,9 @@
#ifdef FOR_MSW
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "xpm.h"
#include "xpmi.h" /* for XpmMalloc */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 16:51:30 +0000