[multiple changes]
2000-12-10 Robert Lipe <robertlipe@usa.net> * jargrep.c (jargrep): Added null statement after case. 2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com> * Makefile: Removed. * Makefile.in: Rebuilt with `-i' and `--enable-foreign'. (http://gcc.gnu.org/ml/gcc/2000-12/msg00294.html) From-SVN: r38182
This commit is contained in:
Alexandre Petit-Bianco
parent
48a9aced0c
commit
a0932f7d1a
4 changed files with 29 additions and 97 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2000-12-10 Robert Lipe <robertlipe@usa.net>
|
||||
|
||||
* jargrep.c (jargrep): Added null statement after case.
|
||||
|
||||
2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com>
|
||||
|
||||
* Makefile: Removed.
|
||||
* Makefile.in: Rebuilt with `-i' and `--enable-foreign'.
|
||||
|
||||
Tue Nov 16 15:11:36 2000 Alexandre Petit-Bianco <apbianco@cygnus.com>
|
||||
|
||||
* Makefile.am: New file.
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
# Generated automatically from Makefile.in by configure.
|
||||
CFLAGS = -g -O2 -DHAVE_CONFIG_H
|
||||
CC = gcc
|
||||
INSTALL = /usr/bin/ginstall -c
|
||||
prefix = /usr/local
|
||||
exec_prefix = ${prefix}
|
||||
BINARY = ${exec_prefix}/bin/fastjar
|
||||
|
||||
all: fastjar grepjar
|
||||
|
||||
fastjar: jartool.o dostime.o compress.o pushback.o
|
||||
$(CC) -o $@ jartool.o dostime.o compress.o pushback.o -lz
|
||||
|
||||
grepjar: jargrep.o dostime.o compress.o pushback.o
|
||||
$(CC) -o $@ jargrep.o dostime.o compress.o pushback.o -lz
|
||||
|
||||
install: fastjar
|
||||
${INSTALL} -s -m 755 fastjar $(BINARY)
|
||||
|
||||
uninstall:
|
||||
/bin/rm -f $(BINARY)
|
||||
|
||||
jartool.o: jartool.c dostime.c jartool.h zipfile.h dostime.h compress.h
|
||||
|
||||
jartool.c: jartool.h zipfile.h
|
||||
|
||||
dostime.o: dostime.c dostime.h
|
||||
|
||||
dostime.c: dostime.h
|
||||
|
||||
compress.o: compress.c compress.h
|
||||
|
||||
compress.c: compress.h
|
||||
|
||||
pushback.o: pushback.c pushback.h
|
||||
|
||||
pushback.c: pushback.h
|
||||
|
||||
jargrep.c: jargrep.h
|
||||
|
||||
jargrep.o: jargrep.c jargrep.h
|
||||
|
||||
clean:
|
||||
rm -rf *.o *~ core fastjar
|
||||
|
|
@ -115,8 +115,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|||
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
DEP_FILES = .deps/compress.P .deps/dostime.P .deps/jargrep.P \
|
||||
.deps/jartool.P .deps/pushback.P
|
||||
SOURCES = $(fastjar_SOURCES) $(grepjar_SOURCES)
|
||||
OBJECTS = $(fastjar_OBJECTS) $(grepjar_OBJECTS)
|
||||
|
||||
|
|
@ -124,9 +122,9 @@ all: all-redirect
|
|||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
|
|
@ -193,6 +191,9 @@ uninstall-binPROGRAMS:
|
|||
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
||||
done
|
||||
|
||||
.c.o:
|
||||
$(COMPILE) -c $<
|
||||
|
||||
.s.o:
|
||||
$(COMPILE) -c $<
|
||||
|
||||
|
|
@ -284,11 +285,6 @@ distdir: $(DISTFILES)
|
|||
-rm -rf $(distdir)
|
||||
mkdir $(distdir)
|
||||
-chmod 777 $(distdir)
|
||||
here=`cd $(top_builddir) && pwd`; \
|
||||
top_distdir=`cd $(distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
|
|
@ -299,38 +295,6 @@ distdir: $(DISTFILES)
|
|||
|| cp -p $$d/$$file $(distdir)/$$file || :; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
|
||||
|
||||
-include $(DEP_FILES)
|
||||
|
||||
mostlyclean-depend:
|
||||
|
||||
clean-depend:
|
||||
|
||||
distclean-depend:
|
||||
-rm -rf .deps
|
||||
|
||||
maintainer-clean-depend:
|
||||
|
||||
%.o: %.c
|
||||
@echo '$(COMPILE) -c $<'; \
|
||||
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||
@-cp .deps/$(*F).pp .deps/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*F).P; \
|
||||
rm .deps/$(*F).pp
|
||||
|
||||
%.lo: %.c
|
||||
@echo '$(LTCOMPILE) -c $<'; \
|
||||
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
||||
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
||||
< .deps/$(*F).pp > .deps/$(*F).P; \
|
||||
tr ' ' '\012' < .deps/$(*F).pp \
|
||||
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
||||
>> .deps/$(*F).P; \
|
||||
rm -f .deps/$(*F).pp
|
||||
info-am:
|
||||
info: info-am
|
||||
dvi-am:
|
||||
|
|
@ -371,27 +335,25 @@ distclean-generic:
|
|||
|
||||
maintainer-clean-generic:
|
||||
mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
|
||||
mostlyclean-compile mostlyclean-tags mostlyclean-depend \
|
||||
mostlyclean-compile mostlyclean-tags \
|
||||
mostlyclean-generic
|
||||
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
|
||||
clean-depend clean-generic mostlyclean-am
|
||||
clean-generic mostlyclean-am
|
||||
|
||||
clean: clean-am
|
||||
|
||||
distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
|
||||
distclean-tags distclean-depend distclean-generic \
|
||||
clean-am
|
||||
distclean-tags distclean-generic clean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -f config.status
|
||||
|
||||
maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
|
||||
maintainer-clean-compile maintainer-clean-tags \
|
||||
maintainer-clean-depend maintainer-clean-generic \
|
||||
distclean-am
|
||||
maintainer-clean-generic distclean-am
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
|
||||
|
|
@ -403,11 +365,10 @@ mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
|
|||
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
|
||||
clean-tags maintainer-clean-tags distdir mostlyclean-depend \
|
||||
distclean-depend clean-depend maintainer-clean-depend info-am info \
|
||||
dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
|
||||
install-exec-am install-exec install-data-am install-data install-am \
|
||||
install uninstall-am uninstall all-redirect all-am all installdirs \
|
||||
clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
|
||||
check-am installcheck-am installcheck all-recursive-am install-exec-am \
|
||||
install-exec install-data-am install-data install-am install \
|
||||
uninstall-am uninstall all-redirect all-am all installdirs \
|
||||
mostlyclean-generic distclean-generic clean-generic \
|
||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,14 @@
|
|||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: jargrep.c,v 1.8 2000/09/13 14:02:02 cory Exp $
|
||||
/* $Id: jargrep.c,v 1.1 2000/12/09 03:08:23 apbianco Exp $
|
||||
|
||||
$Log: jargrep.c,v $
|
||||
Revision 1.1 2000/12/09 03:08:23 apbianco
|
||||
2000-12-08 Alexandre Petit-Bianco <apbianco@cygnus.com>
|
||||
|
||||
* fastjar: Imported.
|
||||
|
||||
Revision 1.8 2000/09/13 14:02:02 cory
|
||||
Reformatted some of the code to more closly match the layout of the orriginal
|
||||
fastjar utility.
|
||||
|
|
@ -561,6 +566,7 @@ void jargrep(regex_t *exp, regex_t *nl_exp, char *jarfile, int options) {
|
|||
break;
|
||||
case 2:
|
||||
/* fall through continue */
|
||||
;
|
||||
}
|
||||
}
|
||||
} while(floop);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue