diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-22 17:32:28 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-22 17:32:28 +0000 |
| commit | e55aa207650ecd59f44d03082b6d4ee3f80a13db (patch) | |
| tree | 0ca343cb9d848666f40f3bc731205a7b2ae790fd /fastjar | |
| parent | 3d4a926431f0c08ead987da3d4eda07348b80408 (diff) | |
| download | ppe42-gcc-e55aa207650ecd59f44d03082b6d4ee3f80a13db.tar.gz ppe42-gcc-e55aa207650ecd59f44d03082b6d4ee3f80a13db.zip | |
* Makefile.in: Rebuilt.
* Makefile.am (bin_PROGRAMS): Remove grepjar.
(EXTRA_PROGRAMS): New macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39184 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fastjar')
| -rw-r--r-- | fastjar/ChangeLog | 5 | ||||
| -rw-r--r-- | fastjar/Makefile.am | 3 | ||||
| -rw-r--r-- | fastjar/Makefile.in | 23 |
3 files changed, 19 insertions, 12 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 20c1e59ecfc..d34f7d8c3aa 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,8 @@ +2001-01-21 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (bin_PROGRAMS): Remove grepjar. + (EXTRA_PROGRAMS): New macro. 2000-12-28 Robert Lipe <robertl@sco.com> diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index fa22049ed4b..b75f077b907 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -40,7 +40,8 @@ AM_MAKEFLAGS = \ INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -bin_PROGRAMS = fastjar grepjar +bin_PROGRAMS = fastjar +EXTRA_PROGRAMS = grepjar fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h fastjar_LDADD = $(ZLIBS) fastjar_DEPENDENCIES = $(ZDEPS) diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index 94b3a1af5df..acb85e335ef 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -114,7 +114,8 @@ AM_MAKEFLAGS = \ INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -bin_PROGRAMS = fastjar grepjar +bin_PROGRAMS = fastjar +EXTRA_PROGRAMS = grepjar fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h fastjar_LDADD = $(ZLIBS) fastjar_DEPENDENCIES = $(ZDEPS) @@ -134,10 +135,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -fastjar_OBJECTS = jartool.o dostime.o compress.o pushback.o -fastjar_LDFLAGS = grepjar_OBJECTS = jargrep.o dostime.o compress.o pushback.o grepjar_LDFLAGS = +fastjar_OBJECTS = jartool.o dostime.o compress.o pushback.o +fastjar_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -151,14 +152,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES) -OBJECTS = $(fastjar_OBJECTS) $(grepjar_OBJECTS) +SOURCES = $(grepjar_SOURCES) $(fastjar_SOURCES) +OBJECTS = $(grepjar_OBJECTS) $(fastjar_OBJECTS) all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ @@ -246,14 +247,14 @@ distclean-compile: maintainer-clean-compile: -fastjar: $(fastjar_OBJECTS) $(fastjar_DEPENDENCIES) - @rm -f fastjar - $(LINK) $(fastjar_LDFLAGS) $(fastjar_OBJECTS) $(fastjar_LDADD) $(LIBS) - grepjar: $(grepjar_OBJECTS) $(grepjar_DEPENDENCIES) @rm -f grepjar $(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS) +fastjar: $(fastjar_OBJECTS) $(fastjar_DEPENDENCIES) + @rm -f fastjar + $(LINK) $(fastjar_LDFLAGS) $(fastjar_OBJECTS) $(fastjar_LDADD) $(LIBS) + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -324,7 +325,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ |
