Rename getopt to libcompat

diff --git a/ChangeLog b/ChangeLog
index fe45de820de2cf0520a0112d57d4a315c54de88f..7f225d02e6488b04fb727791199561aad2c95c82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-28  Guillem Jover  <guillem@debian.org>
+
+       * getopt: Rename to ...
+       * libcompat: ... this.
+       * configure.ac (AC_CONFIG_FILES): Likewise.
+       * Makefile.am (SUBDIRS): Likewise.
+       * utils/Makefile.am (INCLUDES): Likewise.
+       (start_stop_daemon_LDADD): Use '../libcompat/libcompat.a' instead of
+       '../getopt/libopt.a'.
+       * libcompat/Makefile.am (noinst_LIBRARIES): Rename 'libopt.a' to
+       'libcompat.a'.
+       (libopt_a_SOURCES): Rename to ...
+       (libcompat_a_SOURCES): ... this.
+
 2008-01-27  Raphael Hertzog  <hertzog@debian.org>
 
        * README.feature-removal-schedule: Deprecate support of substvars

diff --git a/Makefile.am b/Makefile.am
index 28cd3b06107959849f7af540b46f81a4cd86eb27..529fa65a08390c382863c7bade4903a89a7de263 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ if WITH_DSELECT
 endif
 
 SUBDIRS = \
-       getopt \
+       libcompat \
        lib \
        src \
        $(MAYBE_DSELECT) \

diff --git a/configure.ac b/configure.ac
index aaf51d07bf1e76022a7604286a3a0d6b391558f6..a32ebf409fbed2ced750f6e81405a4f5729b886e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ AC_CONFIG_FILES([ Makefile
                  dselect/Makefile
                  dselect/methods/Makefile
                  dselect/po/Makefile.in
-                 getopt/Makefile
+                 libcompat/Makefile
                  lib/Makefile
                  man/Makefile
                  origins/Makefile

diff --git a/getopt/.gitignore b/libcompat/.gitignore
similarity index 100%
rename from getopt/.gitignore
rename to libcompat/.gitignore

diff --git a/getopt/Makefile.am b/libcompat/Makefile.am
similarity index 83%
rename from getopt/Makefile.am
rename to libcompat/Makefile.am
index 9201a267913b6e1ea1e65d225c678c8bd9ad1f53..ba93ee402ae1e58e8778ff93087b0cdcf2871409 100644 (file)
--- a/getopt/Makefile.am
+++ b/libcompat/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES = \
        -I$(top_srcdir)/lib
 
 
-noinst_LIBRARIES = libopt.a
+noinst_LIBRARIES = libcompat.a
 
-libopt_a_SOURCES = \
+libcompat_a_SOURCES = \
        closeout.c closeout.h \
        error.h \
        getopt.c getopt.h \

diff --git a/getopt/closeout.c b/libcompat/closeout.c
similarity index 100%
rename from getopt/closeout.c
rename to libcompat/closeout.c

diff --git a/getopt/closeout.h b/libcompat/closeout.h
similarity index 100%
rename from getopt/closeout.h
rename to libcompat/closeout.h

diff --git a/getopt/error.h b/libcompat/error.h
similarity index 100%
rename from getopt/error.h
rename to libcompat/error.h

diff --git a/getopt/getopt.c b/libcompat/getopt.c
similarity index 100%
rename from getopt/getopt.c
rename to libcompat/getopt.c

diff --git a/getopt/getopt.h b/libcompat/getopt.h
similarity index 100%
rename from getopt/getopt.h
rename to libcompat/getopt.h

diff --git a/getopt/getopt1.c b/libcompat/getopt1.c
similarity index 100%
rename from getopt/getopt1.c
rename to libcompat/getopt1.c

diff --git a/getopt/long-options.c b/libcompat/long-options.c
similarity index 100%
rename from getopt/long-options.c
rename to libcompat/long-options.c

diff --git a/getopt/long-options.h b/libcompat/long-options.h
similarity index 100%
rename from getopt/long-options.h
rename to libcompat/long-options.h

diff --git a/getopt/obstack.c b/libcompat/obstack.c
similarity index 100%
rename from getopt/obstack.c
rename to libcompat/obstack.c

diff --git a/getopt/obstack.h b/libcompat/obstack.h
similarity index 100%
rename from getopt/obstack.h
rename to libcompat/obstack.h

diff --git a/utils/Makefile.am b/utils/Makefile.am
index ef4563578336b33c8c9cd97e7aa7508aa5c26e73..2f5fb35b51ce0e10211eee9fd5ba24e6c9b65989 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -3,7 +3,7 @@
 localedir = $(datadir)/locale
 INCLUDES = \
        -DLOCALEDIR=\"$(localedir)\" \
-       -I$(top_srcdir)/getopt \
+       -I$(top_srcdir)/libcompat \
        -I$(top_srcdir)/lib
 
 
@@ -13,6 +13,6 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_SOURCES = \
        start-stop-daemon.c
 
-  start_stop_daemon_LDADD = ../getopt/libopt.a $(SSD_LIBS)
+  start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
 endif