Small fixes.

Author: bhaible

ChangeLog

@@ -1,3 +1,16 @@
+2003-05-06  Bruno Haible  <bruno@clisp.org>
+
+	* srclib/Makefile.am (DEFS): Fix spelling of DEPENDS_ON_LIBICONV.
+	* srclib/Makefile.msvc (CFLAGS): Likewise.
+
+	* srclib/Makefile.msvc (INCLUDES): Add -I.. .
+	Reported by Perry Rapp.
+
+	* Makefile.msvc (config.h): New rule.
+	(all): Depend on it.
+	(mostlyclean, clean, distclean, maintainer-clean): Erase config.h.
+	Reported by Perry Rapp.
+
 2003-05-06  Bruno Haible  <bruno@clisp.org>
 
 	* autoconf/config.guess: Update to GNU version 2003-02-22.
@@ -248,6 +261,7 @@
 	* Makefile.devel (CLISP_DIR): Comment out.
 	(AUTOCONF_FILES): Change to aclocal.m4.
 	(aclocal.m4): Renamed from autoconf/aclocal.m4. Update dependencies.
+	(configure.in): Drop --include option.
 
 2003-03-17  Bruno Haible  <bruno@clisp.org>
 

Makefile.msvc

@@ -59,7 +59,7 @@ INSTALL_DATA = copy
 
 SHELL = /bin/sh
 
-all : force
+all : config.h force
 	cd libcharset
 	$(MAKE) -f Makefile.msvc all
 	cd ..
@@ -88,6 +88,10 @@ all : force
 	$(MAKE) -f Makefile.msvc all
 	cd ..
 
+config.h : config.h.msvc
+	-$(RM) config.h
+	$(LN) config.h.msvc config.h
+
 install : force
 	cd libcharset
 	$(MAKE) -f Makefile.msvc install
@@ -187,6 +191,7 @@ check : all force
 	cd ..
 
 mostlyclean : force
+	$(RM) config.h
 	cd libcharset
 	$(MAKE) -f Makefile.msvc mostlyclean
 	cd ..
@@ -212,6 +217,7 @@ mostlyclean : force
 	cd ..
 
 clean : force
+	$(RM) config.h
 	cd libcharset
 	$(MAKE) -f Makefile.msvc clean
 	cd ..
@@ -237,6 +243,7 @@ clean : force
 	cd ..
 
 distclean : force
+	$(RM) config.h
 	cd libcharset
 	$(MAKE) -f Makefile.msvc distclean
 	cd ..
@@ -262,6 +269,7 @@ distclean : force
 	cd ..
 
 maintainer-clean : force
+	$(RM) config.h
 	cd libcharset
 	$(MAKE) -f Makefile.msvc maintainer-clean
 	cd ..

srclib/Makefile.am

@@ -56,7 +56,7 @@ EXTRA_DIST += \
 
 INCLUDES = -I. -I$(srcdir)
 
-DEFS = -DDEPENDS_ON_LIBCONV=1 -DDEPENDS_ON_LIBINTL=1 @DEFS@
+DEFS = -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 @DEFS@
 
 
 # >>> gnulib module stdbool.

srclib/Makefile.msvc

@@ -64,9 +64,9 @@ INCINTL = -I$(includedir)
 LIBINTL = $(libdir)\intl.lib
 !endif
 
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H $(NLSFLAGS) -DDEPENDS_ON_LIBCONV=1 -DDEPENDS_ON_LIBINTL=1
+CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H $(NLSFLAGS) -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1
 
-INCLUDES = -I. $(INCINTL)
+INCLUDES = -I. -I.. $(INCINTL)
 
 AR = lib
 AR_FLAGS = /out: