mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-17 20:09:37 +08:00
* Makefile.am (bin_PROGRAMS): Renamed from "fastjar" to "jar".
From-SVN: r42205
This commit is contained in:
parent
07b5314928
commit
7332066bda
@ -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>
|
2001-05-03 John David Anglin <dave@hiauly1.hia.nrc.ca>
|
||||||
|
|
||||||
* jartool.c (jt_strdup): New function.
|
* jartool.c (jt_strdup): New function.
|
||||||
|
@ -40,11 +40,11 @@ AM_MAKEFLAGS = \
|
|||||||
|
|
||||||
INCLUDES = -I. -I$(top_srcdir) $(ZINCS)
|
INCLUDES = -I. -I$(top_srcdir) $(ZINCS)
|
||||||
|
|
||||||
bin_PROGRAMS = fastjar
|
bin_PROGRAMS = jar
|
||||||
EXTRA_PROGRAMS = grepjar
|
EXTRA_PROGRAMS = grepjar
|
||||||
fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
||||||
fastjar_LDADD = $(ZLIBS)
|
jar_LDADD = $(ZLIBS)
|
||||||
fastjar_DEPENDENCIES = $(ZDEPS)
|
jar_DEPENDENCIES = $(ZDEPS)
|
||||||
grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
||||||
grepjar_LDADD = $(ZLIBS)
|
grepjar_LDADD = $(ZLIBS)
|
||||||
grepjar_DEPENDENCIES = $(ZDEPS)
|
grepjar_DEPENDENCIES = $(ZDEPS)
|
||||||
|
@ -114,11 +114,11 @@ AM_MAKEFLAGS = \
|
|||||||
|
|
||||||
INCLUDES = -I. -I$(top_srcdir) $(ZINCS)
|
INCLUDES = -I. -I$(top_srcdir) $(ZINCS)
|
||||||
|
|
||||||
bin_PROGRAMS = fastjar
|
bin_PROGRAMS = jar
|
||||||
EXTRA_PROGRAMS = grepjar
|
EXTRA_PROGRAMS = grepjar
|
||||||
fastjar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
jar_SOURCES = jartool.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
||||||
fastjar_LDADD = $(ZLIBS)
|
jar_LDADD = $(ZLIBS)
|
||||||
fastjar_DEPENDENCIES = $(ZDEPS)
|
jar_DEPENDENCIES = $(ZDEPS)
|
||||||
grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
grepjar_SOURCES = jargrep.c dostime.c compress.c pushback.c jartool.h zipfile.h dostime.h compress.h pushback.h
|
||||||
grepjar_LDADD = $(ZLIBS)
|
grepjar_LDADD = $(ZLIBS)
|
||||||
grepjar_DEPENDENCIES = $(ZDEPS)
|
grepjar_DEPENDENCIES = $(ZDEPS)
|
||||||
@ -137,8 +137,8 @@ LDFLAGS = @LDFLAGS@
|
|||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
grepjar_OBJECTS = jargrep.o dostime.o compress.o pushback.o
|
grepjar_OBJECTS = jargrep.o dostime.o compress.o pushback.o
|
||||||
grepjar_LDFLAGS =
|
grepjar_LDFLAGS =
|
||||||
fastjar_OBJECTS = jartool.o dostime.o compress.o pushback.o
|
jar_OBJECTS = jartool.o dostime.o compress.o pushback.o
|
||||||
fastjar_LDFLAGS =
|
jar_LDFLAGS =
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
|
||||||
CCLD = $(CC)
|
CCLD = $(CC)
|
||||||
@ -152,8 +152,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||||||
|
|
||||||
TAR = tar
|
TAR = tar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
SOURCES = $(grepjar_SOURCES) $(fastjar_SOURCES)
|
SOURCES = $(grepjar_SOURCES) $(jar_SOURCES)
|
||||||
OBJECTS = $(grepjar_OBJECTS) $(fastjar_OBJECTS)
|
OBJECTS = $(grepjar_OBJECTS) $(jar_OBJECTS)
|
||||||
|
|
||||||
all: all-redirect
|
all: all-redirect
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
@ -251,9 +251,9 @@ grepjar: $(grepjar_OBJECTS) $(grepjar_DEPENDENCIES)
|
|||||||
@rm -f grepjar
|
@rm -f grepjar
|
||||||
$(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS)
|
$(LINK) $(grepjar_LDFLAGS) $(grepjar_OBJECTS) $(grepjar_LDADD) $(LIBS)
|
||||||
|
|
||||||
fastjar: $(fastjar_OBJECTS) $(fastjar_DEPENDENCIES)
|
jar: $(jar_OBJECTS) $(jar_DEPENDENCIES)
|
||||||
@rm -f fastjar
|
@rm -f jar
|
||||||
$(LINK) $(fastjar_LDFLAGS) $(fastjar_OBJECTS) $(fastjar_LDADD) $(LIBS)
|
$(LINK) $(jar_LDFLAGS) $(jar_OBJECTS) $(jar_LDADD) $(LIBS)
|
||||||
|
|
||||||
tags: TAGS
|
tags: TAGS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user