Guillem Jover лет назад: 18
Родитель
Сommit
2b6c73e200

+ 14 - 0
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

+ 1 - 1
Makefile.am

@@ -5,7 +5,7 @@ if WITH_DSELECT
 endif
 
 SUBDIRS = \
-	getopt \
+	libcompat \
 	lib \
 	src \
 	$(MAYBE_DSELECT) \

+ 1 - 1
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

getopt/.gitignore → libcompat/.gitignore


+ 2 - 2
getopt/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 \

getopt/closeout.c → libcompat/closeout.c


getopt/closeout.h → libcompat/closeout.h


getopt/error.h → libcompat/error.h


getopt/getopt.c → libcompat/getopt.c


getopt/getopt.h → libcompat/getopt.h


getopt/getopt1.c → libcompat/getopt1.c


getopt/long-options.c → libcompat/long-options.c


getopt/long-options.h → libcompat/long-options.h


getopt/obstack.c → libcompat/obstack.c


getopt/obstack.h → libcompat/obstack.h


+ 2 - 2
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