lib/sod-hosted.c (sod_makev): Use two statements rather than tricky expression.

[sod] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 50473a9..af62357 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,21 +7,22 @@
 
 ###----- Licensing notice ---------------------------------------------------
 ###
-### This file is part of the Sensble Object Design, an object system for C.
+### This file is part of the Sensible Object Design, an object system for C.
 ###
 ### SOD is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### it under the terms of the GNU Library General Public License as
+### published by the Free Software Foundation; either version 2 of the
+### License, or (at your option) any later version.
 ###
 ### SOD is distributed in the hope that it will be useful,
 ### but WITHOUT ANY WARRANTY; without even the implied warranty of
 ### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### GNU Library General Public License for more details.
 ###
-### You should have received a copy of the GNU General Public License
-### along with SOD; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### You should have received a copy of the GNU Library General Public
+### License along with SOD; if not, write to the Free
+### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+### MA 02111-1307, USA.
 
 include        $(top_srcdir)/vars.am
 
@@ -34,19 +35,24 @@ libsod_la_LDFLAGS    = -version-info $(LIBTOOL_VERSION_INFO)
 libsod_la_SOURCES       =
 
 nodist_libsod_la_SOURCES =
-nodist_pkginclude_HEADERS=
+nodist_pkginclude_HEADERS =
 
 ###--------------------------------------------------------------------------
 ### The source files.
 
-libsod_la_SOURCES      += sod.c
+pkginclude_HEADERS     += keyword.h
+libsod_la_SOURCES      += keyword.c keyword-hosted.c
+dist_man_MANS          += keyword.3
+
 pkginclude_HEADERS     += sod.h
+libsod_la_SOURCES      += sod.c sod-hosted.c
+dist_man_MANS          += sod.3
 
 ###--------------------------------------------------------------------------
 ### Generated builtin module.
 
-nodist_libsod_la_SOURCES+= sod-base.c
-nodist_pkginclude_HEADERS+= sod-base.h
+nodist_libsod_la_SOURCES += sod-base.c
+nodist_pkginclude_HEADERS += sod-base.h
 BUILT_SOURCES          += $(nodist_libsod_la_SOURCES) \
                                $(nodist_pkginclude_HEADERS)
 
@@ -54,8 +60,25 @@ sod-base.c: $(SOD); $(V_SOD_c)$(SOD) -tc --builtin
 sod-base.h: $(SOD); $(V_SOD_h)$(SOD) -th --builtin
 
 ###--------------------------------------------------------------------------
-### Manual pages.
+### Package-configuration file.
+
+pkgconfigdir            = $(libdir)/pkgconfig
+pkgconfig_DATA          = sod.pc
+CLEANFILES             += sod.pc
+EXTRA_DIST             += sod.pc.in
+
+sod.pc: sod.pc.in Makefile
+       $(SUBST) $(srcdir)/sod.pc.in >$@.new $(SUBSTITUTIONS) && mv $@.new $@
+
+###--------------------------------------------------------------------------
+### Autoconf machinery.
+
+aclocaldir              = $(datadir)/aclocal
+dist_aclocal_DATA       = sod.m4
+
+###--------------------------------------------------------------------------
+### Other manual pages.
 
-dist_man_MANS          += sod.3 sod-structs.3
+dist_man_MANS          += sod-structs.3
 
 ###----- That's all, folks --------------------------------------------------