diff options
author | Raja R Harinath <harinath@src.gnome.org> | 1998-11-04 22:34:13 +0000 |
---|---|---|
committer | Raja R Harinath <harinath@src.gnome.org> | 1998-11-04 22:34:13 +0000 |
commit | 4c4ad2b41658d151a53db777b50a6f0f3fec257f (patch) | |
tree | 52d5344f62a50ce5a011583a41173fc05572a96b | |
parent | 88071ff4768bfca9dbc8c4134dac5d2ae07bae07 (diff) | |
download | gnome-common-4c4ad2b41658d151a53db777b50a6f0f3fec257f.tar.gz |
Include gnomesupport.h unconditionally. Build libgnomesupport.la
* gnomesupport-fake.h: Include gnomesupport.h unconditionally.
* Makefile.am: Build libgnomesupport.la unconditionally.
(popt_sources): List `popt' sources.
(libgnomesupport_la_SOURCES): Include $popt_sources.
(include_HEADERS): Install `popt.h'.
(noinst_HEADERSS): Don't install poptint.h and findme.h.
* popt.c: New file. From the POPT package. Replacement for
argp/getopt.
* poptparse.c: Likewise.
* popthelp.c: Likewise.
* poptconfig.c: Likewise.
* findme.c: Likewise.
* findme.h: Likewise.
* popt.h: Likewise.
* poptint.h: Likewise.
svn path=/trunk/; revision=464
-rw-r--r-- | support/ChangeLog | 18 | ||||
-rw-r--r-- | support/Makefile.am | 24 | ||||
-rw-r--r-- | support/gnomesupport-fake.h | 5 |
3 files changed, 29 insertions, 18 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 5517674..804d483 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,21 @@ +1998-11-04 Raja R Harinath <harinath@cs.umn.edu> + + * gnomesupport-fake.h: Include gnomesupport.h unconditionally. + * Makefile.am: Build libgnomesupport.la unconditionally. + (popt_sources): List `popt' sources. + (libgnomesupport_la_SOURCES): Include $popt_sources. + (include_HEADERS): Install `popt.h'. + (noinst_HEADERSS): Don't install poptint.h and findme.h. + * popt.c: New file. From the POPT package. Replacement for + argp/getopt. + * poptparse.c: Likewise. + * popthelp.c: Likewise. + * poptconfig.c: Likewise. + * findme.c: Likewise. + * findme.h: Likewise. + * popt.h: Likewise. + * poptint.h: Likewise. + 1998-09-02 Raja R Harinath <harinath@cs.umn.edu> * canonicalize.c (realpath): Remove `weak_alias'. diff --git a/support/Makefile.am b/support/Makefile.am index 6e0ae3a..f1a21b1 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -2,7 +2,6 @@ supportincludedir = $(pkglibdir)/include -if BUILD_GNOME_SUPPORT INCLUDES = -D_GNU_SOURCE lib_LTLIBRARIES = libgnomesupport.la @@ -15,10 +14,16 @@ supportinclude_DATA = gnomesupport.h # These are internal headers: they are used only when compiling and # should not be installed -noinst_HEADERS = argp-fmtstream.h argp-namefrob.h gnomesupport-fake.h +noinst_HEADERS = argp-fmtstream.h argp-namefrob.h gnomesupport-fake.h \ + findme.h poptint.h -# gnomesupport.h is listed here to ensure that it is built -libgnomesupport_la_SOURCES = gnomesupport.h long-options.c gnome-argp.c +# Hmm... should we move `error.h' here. +include_HEADERS = popt.h + +popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c +other_sources = long-options.c gnome-argp.c + +libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) $(other_sources) libgnomesupport_la_LIBADD = @LTLIBOBJS@ libgnomesupport_la_LDFLAGS = -version-info 0:0:0 @@ -30,14 +35,3 @@ gnomesupport.h: gnomesupport.awk $(top_builddir)/config.h $(AWK) -f $(srcdir)/gnomesupport.awk < $(top_builddir)/config.h > gsh-t mv gsh-t gnomesupport.h -endif - -EXTRA_DIST = argp-test.c argp.texi gnomesupport.awk README-gnome \ - argp-ba.c argp-eexst.c argp-fmtstream.c argp-fmtstream.h \ - argp-fs-xinl.c argp-help.c argp-namefrob.h argp-parse.c \ - argp-pv.c argp-pvh.c argp-test.c argp-xinl.c argp.h \ - easy-vsnprintf.c getopt.c getopt.h getopt1.c gnome-argp.c \ - gnome-argp.h long-options.c long-options.h memmove.c mkstemp.c \ - scandir.c strcasecmp.c strerror.c strndup.c strnlen.c strtod.c \ - strtok_r.c strtol.c strtoul.c vasprintf.c vsnprintf.c error.h \ - gnomesupport-fake.h error.c diff --git a/support/gnomesupport-fake.h b/support/gnomesupport-fake.h index 9b9eae1..a6423d0 100644 --- a/support/gnomesupport-fake.h +++ b/support/gnomesupport-fake.h @@ -5,12 +5,11 @@ # include <config.h> #endif -/* This is required to get `size_t' on some systems. */ +#include <stddef.h> +/* ??? This is required to get `size_t' on some systems. */ #include <sys/types.h> -#ifdef NEED_GNOMESUPPORT_H #include <gnomesupport.h> -#endif #include <gnome-argp.h> |