[Spread-cvs] cvs commit: spread/daemon configure.in configure Makefile.in
jonathan at spread.org
jonathan at spread.org
Wed Sep 25 12:35:27 EDT 2002
jonathan 02/09/25 16:35:27
Modified: daemon configure.in configure Makefile.in
Log:
Fix build errors with separate buildtools directory and with building
binaries in separate directories from the source. Fix install target.
Add a 'make parser' target and remove automatic generation of lex/yacc files.
The use of this will only be needed if building from cvs, the released
source packages will have the lex.yy.c and y.tab.* files already built.
This avoids problems with platforms with buggy versions of bison.
Revision Changes Path
1.3 +1 -1 spread/daemon/configure.in
Index: configure.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in 23 Sep 2002 20:10:27 -0000 1.2
+++ configure.in 25 Sep 2002 16:35:26 -0000 1.3
@@ -576,7 +576,7 @@
AC_DEFINE(HAVE_SYS_NERR)
fi
-for i in `grep "SP_....._VERSION" spread_params.h | sed -e 's/#define//g' -e 's/[ ]//g' -e 's/VERSION/VERSION=/g;'`
+for i in `grep "SP_....._VERSION" ${srcdir}/spread_params.h | sed -e 's/#define//g' -e 's/[ ]//g' -e 's/VERSION/VERSION=/g;'`
do
eval $i
done
1.3 +1 -1 spread/daemon/configure
Index: configure
===================================================================
RCS file: /storage/cvsroot/spread/daemon/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 23 Sep 2002 20:16:13 -0000 1.2
+++ configure 25 Sep 2002 16:35:26 -0000 1.3
@@ -3290,7 +3290,7 @@
fi
-for i in `grep "SP_....._VERSION" spread_params.h | sed -e 's/#define//g' -e 's/[ ]//g' -e 's/VERSION/VERSION=/g;'`
+for i in `grep "SP_....._VERSION" ${srcdir}/spread_params.h | sed -e 's/#define//g' -e 's/[ ]//g' -e 's/VERSION/VERSION=/g;'`
do
eval $i
done
1.2 +24 -17 spread/daemon/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 16 Sep 2002 16:59:06 -0000 1.1
+++ Makefile.in 25 Sep 2002 16:35:26 -0000 1.2
@@ -11,6 +11,7 @@
piddir=@piddir@
srcdir=@srcdir@
top_srcdir=@top_srcdir@
+buildtoolsdir=$(srcdir)/buildtools
DESTDIR=
VPATH=@srcdir@
@@ -73,7 +74,7 @@
-D/etc/spread.conf=$(sysconfdir)/spread.conf \
-D/var/run/spread.pid=$(piddir)/spread.pid
-FIXPATHSCMD = $(PERL) $(srcdir)/buildtools/fixpaths $(PATHSUBS)
+FIXPATHSCMD = $(PERL) $(buildtoolsdir)/fixpaths $(PATHSUBS)
all: $(CONFIGFILES) $(MANPAGES) $(TARGETS)
@@ -84,7 +85,7 @@
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
.c.to:
- $(CC) $(CFLAGS) $(CPPFLAGS) -D_REENTRANT -c $*.c -o $*.to
+ $(CC) $(CFLAGS) $(CPPFLAGS) -D_REENTRANT -c $< -o $*.to
.c.lo:
$(SHCC) $(SHCFLAGS) $(SHCPPFLAGS) -c $< -o $*.lo
@@ -92,15 +93,17 @@
.c.tlo:
$(SHCC) $(SHCFLAGS) $(SHCPPFLAGS) -D_REENTRANT -c $< -o $*.tlo
-lex.yy.c: config_gram.l y.tab.c
+parser:
+ $(YACC) -d config_parse.y
$(LEX) config_gram.l
-y.tab.c: config_parse.y
- $(YACC) -d config_parse.y
+#Disabled now because of timestamp errors causing extra regeneration
+#To build parser run "make parser" after ./configure is run.
+#lex.yy.c: config_gram.l y.tab.c
+# $(LEX) config_gram.l
-libspread.a: $(LIBSP_OBJS)
- $(AR) rv $@ $(LIBSP_OBJS)
- $(RANLIB) $@
+#y.tab.c: config_parse.y
+# $(YACC) -d config_parse.y
none:
@echo "Skipping shared library creation."
@@ -108,6 +111,10 @@
install-none:
@echo "Skipping shared library installation."
+libspread.a: $(LIBSP_OBJS)
+ $(AR) rv $@ $(LIBSP_OBJS)
+ $(RANLIB) $@
+
libspread.dylib: $(LIBSP_SHOBJS)
$(SHLD) -o libspread.$(LIBVERSION).dylib $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
$(SOFTLINK) libspread.$(LIBVERSION).dylib $@
@@ -167,9 +174,9 @@
manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
fi; \
if test "$(MANTYPE)" = "man"; then \
- $(FIXPATHSCMD) $${manpage} | $(PERL) $(srcdir)/buildtools/mdoc2man.pl > $@; \
+ $(FIXPATHSCMD) $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $(srcdir)/$@; \
else \
- $(FIXPATHSCMD) $${manpage} > $@; \
+ $(FIXPATHSCMD) $${manpage} > $(srcdir)/$@; \
fi
clean:
@@ -199,12 +206,12 @@
install: $(TARGETS) install-files install- at LIBSPSO@ install- at LIBTSPSO@
install-files:
- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
- $(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sbindir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(libdir)
$(INSTALL) -m 0755 -s spmonitor $(DESTDIR)$(bindir)/spmonitor
$(INSTALL) -m 0755 -s spuser $(DESTDIR)$(bindir)/spuser
$(INSTALL) -m 0755 -s sptuser $(DESTDIR)$(bindir)/sptuser
@@ -216,7 +223,7 @@
$(INSTALL) -m 644 docs/SP_$$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/SP_$$page.3; \
done
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
- $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi
if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
$(INSTALL) -m 644 sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
More information about the Spread-cvs
mailing list