diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-17 17:02:03 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-17 17:02:03 +0000 |
| commit | 17bad8a87f1f940b8728640902cb922571233d0e (patch) | |
| tree | 3b26e0157d2982f4a300e70a43f464780020a7f9 | |
| parent | 5e74a7c7ee848c07f2562c4d69a1df5c75f4c21b (diff) | |
| download | gcc-17bad8a87f1f940b8728640902cb922571233d0e.tar.gz | |
* Makefile.am (bin_PROGRAMS): Renamed from "fastjar" to "jar".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42205 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | fastjar/ChangeLog | 4 | ||||
| -rw-r--r-- | fastjar/Makefile.am | 8 | ||||
| -rw-r--r-- | fastjar/Makefile.in | 22 |
3 files changed, 19 insertions, 15 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index c8d4d2a8b11..ddd4dd4caec 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,7 @@ +2001-05-15 Per Bothner <per@bothner.com> + + * Makefile.am (bin_PROGRAMS): Renamed from "fastjar" to "jar". + 2001-05-03 John David Anglin <dave@hiauly1.hia.nrc.ca> * jartool.c (jt_strdup): New function. diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index b75f077b907..a4393fa55c4 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -40,11 +40,11 @@ AM_MAKEFLAGS = \ INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -bin_PROGRAMS = fastjar +bin_PROGRAMS = jar 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) +jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h +jar_LDADD = $(ZLIBS) +jar_DEPENDENCIES = $(ZDEPS) grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h grepjar_LDADD = $(ZLIBS) grepjar_DEPENDENCIES = $(ZDEPS) diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index acb85e335ef..04f93c1645d 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -114,11 +114,11 @@ AM_MAKEFLAGS = \ INCLUDES = -I. -I$(top_srcdir) $(ZINCS) -bin_PROGRAMS = fastjar +bin_PROGRAMS = jar 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) +jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h +jar_LDADD = $(ZLIBS) +jar_DEPENDENCIES = $(ZDEPS) grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h grepjar_LDADD = $(ZLIBS) grepjar_DEPENDENCIES = $(ZDEPS) @@ -137,8 +137,8 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ grepjar_OBJECTS = jargrep.o dostime.o compress.o pushback.o grepjar_LDFLAGS = -fastjar_OBJECTS = jartool.o dostime.o compress.o pushback.o -fastjar_LDFLAGS = +jar_OBJECTS = jartool.o dostime.o compress.o pushback.o +jar_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -152,8 +152,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best -SOURCES = $(grepjar_SOURCES) $(fastjar_SOURCES) -OBJECTS = $(grepjar_OBJECTS) $(fastjar_OBJECTS) +SOURCES = $(grepjar_SOURCES) $(jar_SOURCES) +OBJECTS = $(grepjar_OBJECTS) $(jar_OBJECTS) all: all-redirect .SUFFIXES: @@ -251,9 +251,9 @@ 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) +jar: $(jar_OBJECTS) $(jar_DEPENDENCIES) + @rm -f jar + $(LINK) $(jar_LDFLAGS) $(jar_OBJECTS) $(jar_LDADD) $(LIBS) tags: TAGS |