|
Check-in Number:
|
1808 | |
| Date: |
2002-Feb-05 20:11:45 (local)
2002-Feb-05 19:11:45 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
Rc can build again, at least with static library linking.
PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from: |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/.cvsignore 1.3 -> 1.4
--- .cvsignore 2002/02/04 22:19:29 1.3
+++ .cvsignore 2002/02/05 19:11:45 1.4
@@ -1,14 +1,16 @@
-Makefile
-configure
-config.status
-config.log
config.cache
+config.log
config.guess
config.sub
-rc_config.h.in
-rc_config.h
+config.status
+configure
libtool.m4
-rc-sample.5
ltmain.sh
-shtool
+Makefile
+rc
rc.1
+rc_config.h
+rc_config.h.in
+rc_pcre.tab
+rc-sample.5
+shtool
|
|
ossp-pkg/rc/Makefile.in 1.7 -> 1.8
--- Makefile.in 2002/02/05 17:29:17 1.7
+++ Makefile.in 2002/02/05 19:11:45 1.8
@@ -48,7 +48,6 @@
RM = rm -f
RMDIR = rmdir
SHTOOL = ./shtool
-LIBTOOL = ./libtool
POD2MAN = pod2man
TRUE = true
@@ -59,16 +58,14 @@
TARGET_MANS = rc.1 rc-sample.5
SRCS = rc.c rc_version.c rc_pcre.c
-OBJS = rc.o rc_version.o rc_pcre.lo
+OBJS = rc.o rc_version.o rc_pcre.o
SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_STR@ @SUBDIR_POPT@
.SUFFIXES:
-.SUFFIXES: .c .cc .cpp .o .lo
+.SUFFIXES: .c .cc .cpp .o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
-.c.lo:
- $(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
all: _SUBDIRS_all $(TARGET)
@@ -92,7 +89,7 @@
done
# Build pcre regex library
-rc_pcre.lo: rc_pcre.tab rc_pcre.c
+rc_pcre.o: rc_pcre.tab rc_pcre.c
rc_pcre.tab: rc_pcre.c
# $(CC) $(CFLAGS) -DRC_PCRE_TAB $(LDFLAGS) -o rc_pcre.gen rc_pcre.c $(LIBS)
$(CC) $(CFLAGS) -DRC_PCRE_TAB $(LDFLAGS) -o rc_pcre.gen rc_pcre.c
@@ -126,20 +123,16 @@
$(SHTOOL) install -c -m 644 rc-sample.5 $(mandir)/man5/rc-sample.5
clean:
- $(RM) $(TARGET) $(OBJS)
+ $(RM) $(TARGET) $(OBJS) $(PROG_NAME).core
distclean: clean
- $(RM) config.log config.status config.cache
- $(RM) Makefile rc_config.h rc_pcre.tab
- $(RM) config.log config.status config.cache
- $(RM) Makefile rc_config.h
- $(RM) libtool
+ $(RM) config.log config.status config.cache # Generated by ./configure
+ $(RM) Makefile rc_config.h # Generated by ./configure
realclean: distclean
- $(RM) ltmain.sh libtool.m4 config.guess config.sub
- $(RM) configure rc_config.h.in
+ $(RM) configure rc_config.h.in # Generated by Autoconf
$(RM) shtool
check: test
test: rc
- @./test.sh
+ ./test.sh
|
|
ossp-pkg/rc/configure.in 1.9 -> 1.10
--- configure.in 2002/02/05 17:29:17 1.9
+++ configure.in 2002/02/05 19:11:45 1.10
@@ -52,9 +52,6 @@
AC_HEADER_STDC
AC_PROG_INSTALL
-sinclude(libtool.m4)
-AC_PROG_LIBTOOL
-
dnl Check other requirements
AC_SET_MAKE
AC_PROG_CC
@@ -118,6 +115,10 @@
dnl Extra library handling
LIBS="$LIBS $LIBS_EXTRA"
+enable_shared=no
+export enable_shared
+enable_headline=no
+export enable_headline
dnl Call other configure scripts
AC_CONFIG_SUBDIRS([$SUBDIR_EX $SUBDIR_STR $SUBDIR_VAR $SUBDIR_POPT])
|
|
ossp-pkg/rc/devtool.conf 1.7 -> 1.8
--- devtool.conf 2002/02/05 17:29:17 1.7
+++ devtool.conf 2002/02/05 19:11:45 1.8
@@ -4,7 +4,6 @@
%autogen
@autogen shtool 1.5.4 "1.5.*" all
- @autogen libtool 1.4.2 "1.4*"
@autogen autoconf 2.52 "2.5.*"
echo "===> rc_ex (devtool autogen)"
@@ -22,7 +21,6 @@
%autoclean
@autoclean shtool
- @autoclean libtool
@autoclean autoconf
echo "===> rc_ex (devtool autoclean)"
|
|
