--- a/liboctave/ChangeLog	Fri Nov 12 20:33:19 2010 -0500
+++ b/liboctave/ChangeLog	Fri Nov 12 20:49:02 2010 -0500
@@ -1,3 +1,20 @@
+2010-11-12  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (LIBOCTAVE_SOURCES): Delete variable.
+	(liboctave_la_SOURCES): Include $(LIBOCTAVE_CXX_SOURCES) and
+	$(LIBOCTAVE_C_SOURCES) in this list instead of
+	$(LIBOCTAVE_SOURCES).
+	(nodist_liboctave_la_SOURCES): New variable.
+	(octinclude_HEADERS): Don't include $(BUILT_INCS) in the list.
+	(noinst_octinclude_HEADERS): New variable.
+	(PRIVATE_INCS): Delete variable.
+	(INCS): Include oct-glob.h in the list.
+	(liboctave_la_SOURCES): Don't include $(PRIVATE_INCS) in the
+	list.
+	(LIBOCT_PATHSEARCH_CXX_SOURCES, LIBOCT_PATHSEARCH_C_SOURCES,
+	LIBOCT_PATHSEARCH_SOURCES): Delete variables.
+	(LIBOCTAVE_CXX_SOURCES): Include pathsearch.cc in the list.
+
 2010-11-12  John W. Eaton  <jwe@octave.org>
 
 	* Array.cc (Array<T>::cat): Simplify previous change.

--- a/liboctave/Makefile.am	Fri Nov 12 20:33:19 2010 -0500
+++ b/liboctave/Makefile.am	Fri Nov 12 20:49:02 2010 -0500
@@ -217,6 +217,7 @@
   oct-convn.h \
   oct-env.h \
   oct-fftw.h \
+  oct-glob.h \
   oct-group.h \
   oct-inttypes.h \
   oct-locbuf.h \
@@ -448,6 +449,7 @@
   oct-syscalls.cc \
   oct-time.cc \
   oct-uname.cc \
+  pathsearch.cc \
   regex-match.cc \
   sparse-sort.cc \
   sparse-util.cc \
@@ -484,21 +486,12 @@
   tempnam.c \
   tempname.c
 
-LIBOCTAVE_SOURCES = $(LIBOCTAVE_CXX_SOURCES) $(BUILT_LIBOCTAVE_CXX_SOURCES) \
-	$(LIBOCTAVE_C_SOURCES)
-
 LIBOCT_READLINE_CXX_SOURCES = cmd-edit.cc cmd-hist.cc
 
 LIBOCT_READLINE_C_SOURCES = oct-rl-edit.c oct-rl-hist.c
 
 LIBOCT_READLINE_SOURCES = $(LIBOCT_READLINE_CXX_SOURCES) $(LIBOCT_READLINE_C_SOURCES)
 
-LIBOCT_PATHSEARCH_CXX_SOURCES = pathsearch.cc
-
-LIBOCT_PATHSEARCH_C_SOURCES = kpse-xfns.c
-
-LIBOCT_PATHSEARCH_SOURCES = pathsearch.cc
-
 LINK_DEPS = \
   $(RLD_FLAG) \
   ../libcruft/libcruft.la \
@@ -515,10 +508,14 @@
   $(PTHREAD_LIBS) $(LIBS)
 
 liboctave_la_SOURCES = \
+  $(LIBOCTAVE_CXX_SOURCES) \
+  $(LIBOCTAVE_C_SOURCES) \
   $(LIBOCTAVE_SOURCES) \
   $(LIBOCT_READLINE_SOURCES) \
-  $(LIBOCT_PATHSEARCH_SOURCES) \
-  $(PRIVATE_INCS)
+  $(LIBOCT_PATHSEARCH_SOURCES)
+
+nodist_liboctave_la_SOURCES = \
+  $(BUILT_LIBOCTAVE_CXX_SOURCES)
 
 liboctave_la_LIBADD = $(LINK_DEPS)
 
@@ -538,11 +535,13 @@
 
 octinclude_HEADERS = \
   $(INCS) \
-  $(BUILT_INCS) \
   $(OTHER_INC) \
   $(TEMPLATE_SRC) \
   $(EXTRA_HEADERS)
 
+nodist_octinclude_HEADERS = \
+  $(BUILT_INCS)
+
 $(OPT_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl
 	@echo making $@ from $<
 	@$(PERL) $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@-t

--- a/liboctave/kpse-xfns.h	Fri Nov 12 20:33:19 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-
-Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
-Copyright (C) 1993, 94, 95, 96 Karl Berry.
-Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-
-This library is free software; you can redistribute it and/or
-modify 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. 
-
-This library 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
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
-
-#if !defined (octave_kpse_xfns_h)
-#define octave_kpse_xfns_h 1
-
-/* Define the characters which separate components of
-   filenames and environment variable paths.  */
-
-/* What separates filename components?  */
-#ifndef DIR_SEP
-#ifdef DOSISH
-/* Either \'s or 's work.  Wayne Sullivan's web2pc prefers /, so we'll
-   go with that.  */
-#define DIR_SEP '/'
-#define DIR_SEP_STRING "/"
-#define IS_DEVICE_SEP(ch) ((ch) == ':')
-#define NAME_BEGINS_WITH_DEVICE(name) ((name.length()>0) && IS_DEVICE_SEP((name)[1]))
-/* On DOS, it's good to allow both \ and / between directories.  */
-#define IS_DIR_SEP(ch) ((ch) == '/' || (ch) == '\\')
-#else
-#define DIR_SEP '/'
-#define DIR_SEP_STRING "/"
-#endif /* not DOSISH */
-#endif /* not DIR_SEP */
-
-#ifndef IS_DIR_SEP
-#define IS_DIR_SEP(ch) ((ch) == DIR_SEP)
-#endif
-#ifndef IS_DEVICE_SEP /* No `devices' on, e.g., Unix.  */
-#define IS_DEVICE_SEP(ch) 0 
-#endif
-#ifndef NAME_BEGINS_WITH_DEVICE
-#define NAME_BEGINS_WITH_DEVICE(name) 0 
-#endif
-
-#endif