Commit 0c9f8376 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
parents bf14010d 5fb792ec

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -3093,7 +3093,6 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl 
   ndb/src/common/logger/Makefile dnl

   ndb/src/common/transporter/Makefile dnl

   ndb/src/common/mgmcommon/Makefile dnl

   ndb/src/common/editline/Makefile dnl

   ndb/src/kernel/Makefile dnl

   ndb/src/kernel/error/Makefile dnl

   ndb/src/kernel/blocks/Makefile dnl

ndb/src/common/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS =	portlib debugger util logger transporter mgmcommon editline

SUBDIRS =	portlib debugger util logger transporter mgmcommon



noinst_LTLIBRARIES = libcommon.la

ndb/src/common/Makefile_old

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
include .defs.mk



LIB_DIRS := \

        portlib		\

        debugger	\

        util		\

        logger



ifneq ($(USE_EDITLINE), N)

LIB_DIRS += editline

endif



DIRS := transporter mgmcommon



include $(NDB_TOP)/Epilogue.mk

ndb/src/common/editline/MANIFEST

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
File Name		Description

--------------------------------------------------------

README			Release notes and copyright

MANIFEST		This shipping list

Make.os9		OS-9 makefile

Makefile		Unix makefile

complete.c		Filename completion routines

editline.3		Manual page for editline library

editline.c		Line-editing routines

editline_internal.h	Internal library header file

os9.h			OS-9-specific declarations

sysos9.c		OS-9-specific routines

sysunix.c		Unix-specific routines

testit.c		Test driver

unix.h			Unix-specific declarations

ndb/src/common/editline/Makefile.am

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 


noinst_LIBRARIES = libeditline.a



libeditline_a_SOURCES = complete.c editline.c sysunix.c



INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include

DEFS = -DANSI_ARROWS -DHAVE_TCGETATTR -DSYS_UNIX



# Don't update the files from bitkeeper

%::SCCS/s.%