X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.in;h=67ce7212b1243110b55e58336fc3cf2db945c0c2;hb=6aae241f16ed2dbe57475cb4c8b3a5b1ca1e9699;hp=83808f5cbe944c63fb32b42f83feee5547f1dee8;hpb=7bfecbc4117c0917eaea6d4a8b6dad4db78982f1;p=gnulib.git

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 83808f5cb..67ce7212b 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -13,7 +13,7 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 SHELL = /bin/sh
 
@@ -30,6 +30,8 @@ YACC = @YACC@
 exec_prefix = @exec_prefix@
 libdir = $(exec_prefix)/lib
 
+GETOPT = getopt.o getopt1.o
+
 SOURCES = getdate.y posixtm.y \
 argmatch.c backupfile.c basename.c dirname.c euidaccess.c \
 error.c filemode.c fsusage.c full-write.c getopt.c getopt1.c \
@@ -43,7 +45,7 @@ memcmp.c memcpy.c memset.c xstrtol.c xstrtoul.c
 
 OBJECTS = getdate.o posixtm.o \
 argmatch.o backupfile.o basename.o dirname.o \
-error.o filemode.o full-write.o getopt.o getopt1.o \
+error.o filemode.o full-write.o $(GETOPT) \
 getversion.o group-member.o idcache.o isdir.o long-options.o makepath.o \
 modechange.o obstack.o safe-read.o save-cwd.o savedir.o \
 stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \
@@ -53,13 +55,16 @@ DISTFILES = Makefile.in backupfile.h getopt.h long-options.h modechange.h \
 fnmatch.h fsusage.h group-member.h makepath.h mountlist.h obstack.h pathmax.h \
 save-cwd.h getdate.c posixtm.c error.h xstrtol.h xstrtoul.h $(SOURCES)
 
-all: libfu.a
+default: all
+all check: libfu.a
 
 .SUFFIXES:
 .SUFFIXES: .c .o
 
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+INCLUDES = -I.. -I$(srcdir)
 .c.o:
-	$(CC) -c $(CPPFLAGS) $(DEFS) -I.. -I$(srcdir) $(CFLAGS) $<
+	$(COMPILE) $<
 
 subdir = lib
 Makefile: ../config.status Makefile.in
@@ -74,8 +79,6 @@ uninstall:
 TAGS: $(SOURCES)
 	etags $(SOURCES)
 
-check:
-
 clean:
 	rm -f *.a *.o
 
@@ -87,7 +90,7 @@ distclean: clean
 maintainer-clean: distclean
 	rm -f TAGS getdate.c posixtm.c
 
-distdir = ../`cat ../distname`/$(subdir)
+distdir = ../@PACKAGE@-@VERSION@/$(subdir)
 dist: $(DISTFILES)
 	for file in $(DISTFILES); do \
 	  ln $$file $(distdir) \
@@ -134,8 +137,8 @@ makepath.o: makepath.h
 obstack.o: obstack.h
 group-member.o: group-member.h
 
-.PHONY: all check clean dist distclean install install-data install-exec \
-installdirs maintainer-clean mostlyclean uninstall
+.PHONY: all check clean default dist distclean install install-data \
+install-exec installdirs maintainer-clean mostlyclean uninstall
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.