ase/include/ase/cmn/makefile.am

@@ -1,5 +1,5 @@
 
-pkginclude_HEADERS = mem.h chr.h str.h map.h rex.h sll.h dll.h
+pkginclude_HEADERS = mem.h chr.h str.h map.h rex.h sll.h dll.h opt.h
 
 pkgincludedir= $(includedir)/ase/cmn
 

ase/include/ase/cmn/opt.h

@@ -4,8 +4,8 @@
  * {License}
  */
 
-#ifndef _ASE_UTL_GETOPT_H_
-#define _ASE_UTL_GETOPT_H_
+#ifndef _ASE_CMN_OPT_H_
+#define _ASE_CMN_OPT_H_
 
 #include <ase/types.h>
 #include <ase/macros.h>
@@ -44,12 +44,12 @@ extern "C" {
 #endif
 
 /*
- * NAME Parse command line options
+ * NAME: parse command line options
  *
- * DESCRIPTION
+ * DESCRIPTION:
  *   TODO:
  *
- * RETURNS ASE_CHAR_EOF, XXXX.XXXX
+ * RETURNS: ASE_CHAR_EOF, XXXX.XXXX
  */
 ase_cint_t ase_getopt (
 	int argc /* argument count */, 

ase/lib/cmn/chr.h

@@ -30,7 +30,6 @@
 	
 	#elif defined(ASE_CHAR_IS_WCHAR)
 	
-		#include <ctype.h>
 		#include <wctype.h>
 		#define ASE_ISUPPER(c) iswupper(c)
 		#define ASE_ISLOWER(c) iswlower(c)

ase/lib/cmn/makefile.am

@@ -4,6 +4,7 @@ AM_CFLAGS = -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libasecmn.la
 libasecmn_la_SOURCES = mem.h chr.h \
-	mem.c chr.c map.c misc.c rex.c str_bas.c str_cnv.c str_dyn.c sll.c dll.c
+	mem.c chr.c map.c misc.c rex.c str_bas.c str_cnv.c str_dyn.c \
+	sll.c dll.c opt.c
 libasecmn_la_LDFLAGS = -version-info 1:0:0
 

ase/lib/cmn/opt.c

@@ -4,7 +4,7 @@
  * {License}
  */
 
-#include <ase/utl/getopt.h>
+#include <ase/cmn/opt.h>
 #include <ase/cmn/str.h>
 
 /* 

ase/lib/utl/makefile.am

@@ -2,5 +2,5 @@
 AM_CFLAGS = -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libaseutl.la
-libaseutl_la_SOURCES = assert.c getopt.c http.c main.c stdio.c
+libaseutl_la_SOURCES = assert.c http.c main.c stdio.c
 libaseutl_la_LDFLAGS = -version-info 1:0:0