jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply changes requested for this pull request

Browse source
This commit is contained in:
FUTATSUKI YASUHITO 2017-06-21 08:07:08 +09:00
commit 7be53b7692
5 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

46
CCache/Makefile.in
View file

@ -8,7 +8,7 @@ bindir=@bindir@
mandir=@mandir@ mandir=@mandir@
INSTALLCMD=@INSTALL@ INSTALLCMD=@INSTALL@
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
MYNAME=@MYNAME@ PROGRAM_NAME=@PROGRAM_NAME@
# Soft link test can be skipped on systems that don't support soft linking # Soft link test can be skipped on systems that don't support soft linking
NOSOFTLINKSTEST= NOSOFTLINKSTEST=
@ -26,55 +26,55 @@ OBJS= ccache.o mdfour.o hash.o execute.o util.o args.o stats.o \
cleanup.o snprintf.o unify.o cleanup.o snprintf.o unify.o
HEADERS = ccache.h mdfour.h HEADERS = ccache.h mdfour.h
all: $(MYNAME)$(EXEEXT) all: $(PROGRAM_NAME)$(EXEEXT)
# Regenerate Makefile if Makefile.in or config.status have changed. # Regenerate Makefile if Makefile.in or config.status have changed.
Makefile: $(srcdir)/Makefile.in ./config.status Makefile: $(srcdir)/Makefile.in ./config.status
$(SHELL) ./config.status $(SHELL) ./config.status
# Note that HTML documentation is actually generated and used from the main SWIG documentation Makefile # Note that HTML documentation is actually generated and used from the main SWIG documentation Makefile
docs: $(srcdir)/$(MYNAME).1 $(srcdir)/web/$(MYNAME)-man.html docs: $(srcdir)/$(PROGRAM_NAME).1 $(srcdir)/web/$(PROGRAM_NAME)-man.html
$(MYNAME)$(EXEEXT): $(OBJS) $(HEADERS) $(PROGRAM_NAME)$(EXEEXT): $(OBJS) $(HEADERS)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(srcdir)/$(MYNAME).1: $(srcdir)/ccache.yo $(srcdir)/$(PROGRAM_NAME).1: $(srcdir)/ccache.yo
-yodl2man -o $(srcdir)/$(MYNAME).1 $(srcdir)/ccache.yo -yodl2man -o $(srcdir)/$(PROGRAM_NAME).1 $(srcdir)/ccache.yo
$(srcdir)/web/$(MYNAME)-man.html: $(srcdir)/ccache.yo $(srcdir)/web/$(PROGRAM_NAME)-man.html: $(srcdir)/ccache.yo
yodl2html -o $(srcdir)/web/$(MYNMAE)-man.html $(srcdir)/ccache.yo yodl2html -o $(srcdir)/web/$(PROGRAM_NAME)-man.html $(srcdir)/ccache.yo
install: $(MYNAME)$(EXEEXT) install: $(PROGRAM_NAME)$(EXEEXT)
@echo "Installing $(MYNAME)" @echo "Installing $(PROGRAM_NAME)"
@echo "Installing $(DESTDIR)${bindir}/$(MYNAME)$(EXEEXT)" @echo "Installing $(DESTDIR)${bindir}/$(PROGRAM_NAME)$(EXEEXT)"
${INSTALLCMD} -d $(DESTDIR)${bindir} ${INSTALLCMD} -d $(DESTDIR)${bindir}
${INSTALLCMD} -m 755 $(MYNAME)$(EXEEXT) $(DESTDIR)${bindir}/$(MYNAME)$(EXEEXT) ${INSTALLCMD} -m 755 $(PROGRAM_NAME)$(EXEEXT) $(DESTDIR)${bindir}/$(PROGRAM_NAME)$(EXEEXT)
install-docs: $(srcdir)/$(MYNAME).1 install-docs: $(srcdir)/$(PROGRAM_NAME).1
@echo "Installing $(DESTDIR)${mandir}/man1/$(MYNAME).1" @echo "Installing $(DESTDIR)${mandir}/man1/$(PROGRAM_NAME).1"
${INSTALLCMD} -d $(DESTDIR)${mandir}/man1 ${INSTALLCMD} -d $(DESTDIR)${mandir}/man1
${INSTALLCMD} -m 644 $(srcdir)/$(MYNAME).1 $(DESTDIR)${mandir}/man1/$(MYNAME).1 ${INSTALLCMD} -m 644 $(srcdir)/$(PROGRAM_NAME).1 $(DESTDIR)${mandir}/man1/$(PROGRAM_NAME).1
uninstall: $(MYNAME)$(EXEEXT) uninstall: $(PROGRAM_NAME)$(EXEEXT)
rm -f $(DESTDIR)${bindir}/$(MYNAME)$(EXEEXT) rm -f $(DESTDIR)${bindir}/$(PROGRAM_NAME)$(EXEEXT)
uninstall-docs: $(srcdir)/$(MYNAME).1 uninstall-docs: $(srcdir)/$(PROGRAM_NAME).1
rm -f $(DESTDIR)${mandir}/man1/$(MYNAME).1 rm -f $(DESTDIR)${mandir}/man1/$(PROGRAM_NAME).1
clean: clean:
/bin/rm -f $(OBJS) *~ $(MYNAME)$(EXEEXT) /bin/rm -f $(OBJS) *~ $(PROGRAM_NAME)$(EXEEXT)
test: test.sh test: test.sh
SWIG_LIB='$(SWIG_LIB)' PATH=../..:$$PATH SWIG='$(SWIG)' CC='$(CC)' NOSOFTLINKSTEST='$(NOSOFTLINKSTEST)' CCACHE='../$(MYNAME)' $(srcdir)/test.sh SWIG_LIB='$(SWIG_LIB)' PATH=../..:$$PATH SWIG='$(SWIG)' CC='$(CC)' NOSOFTLINKSTEST='$(NOSOFTLINKSTEST)' CCACHE='../$(PROGRAM_NAME)' $(srcdir)/test.sh
check: test check: test
distclean: clean distclean: clean
/bin/rm -f Makefile config.h config.sub config.log build-stamp config.status ccache_swig_config.h config_w32.h /bin/rm -f Makefile config.h config.sub config.log build-stamp config.status ccache_swig_config.h config_win32.h
/bin/rm -rf autom4te.cache /bin/rm -rf autom4te.cache
maintainer-clean: distclean maintainer-clean: distclean
/bin/rm -f $(srcdir)/$(MYNAME).1 $(srcdir)/web/$(MYNAME)-man.html /bin/rm -f $(srcdir)/$(PROGRAM_NAME).1 $(srcdir)/web/$(PROGRAM_NAME)-man.html
# FIXME: To fix this, test.sh needs to be able to take ccache from the # FIXME: To fix this, test.sh needs to be able to take ccache from the

4
CCache/ccache.h
View file

@ -6,7 +6,7 @@
#include "config.h" #include "config.h"
#else #else
#include <sys/locking.h> #include <sys/locking.h>
#include "config_w32.h" #include "config_win32.h"
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -51,6 +51,8 @@
#define STATUS_FATAL 4 #define STATUS_FATAL 4
#define STATUS_NOCACHE 5 #define STATUS_NOCACHE 5
#define MYNAME PROGRAM_NAME
#define LIMIT_MULTIPLE 0.8 #define LIMIT_MULTIPLE 0.8
/* default maximum cache size */ /* default maximum cache size */

3
CCache/config_w32.h.in
View file

@ -1,3 +0,0 @@
#if !defined(MYNAME)
#define MYNAME "@MYNAME@.exe"
#endif

3
CCache/config_win32.h.in Normal file
View file

@ -0,0 +1,3 @@
#if !defined(PROGRAM_NAME)
#define PROGRAM_NAME "@PROGRAM_NAME@.exe"
#endif

12
CCache/configure.ac
View file

@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([ccache.h])
AC_MSG_NOTICE([Configuring ccache]) AC_MSG_NOTICE([Configuring ccache])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
AC_CONFIG_FILES([config_w32.h]) AC_CONFIG_FILES([config_win32.h])
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
@ -15,19 +15,19 @@ AC_PROG_CPP
AC_PROG_INSTALL AC_PROG_INSTALL
AC_ARG_PROGRAM # for program_transform_name AC_ARG_PROGRAM # for program_transform_name
AC_SUBST(MYNAME) AC_SUBST(PROGRAM_NAME)
if test "x$program_prefix" != "xNONE" -a "x$program_prefix" != "x" if test "x$program_prefix" != "xNONE" -a "x$program_prefix" != "x"
then then
MYNAME="$program_prefix$PACKAGE_NAME" PROGRAM_NAME="$program_prefix$PACKAGE_NAME"
else else
MYNAME="$PACKAGE_NAME" PROGRAM_NAME="$PACKAGE_NAME"
fi fi
if test "x$program_suffix" != "xNONE" -a "x$program_suffix" != "x" if test "x$program_suffix" != "xNONE" -a "x$program_suffix" != "x"
then then
MYNAME="$MYNAME$program_suffix" PROGRAM_NAME="$PROGRAM_NAME$program_suffix"
fi fi
AC_DEFINE_UNQUOTED(MYNAME, "$MYNAME", [Define my program name]) AC_DEFINE_UNQUOTED(PROGRAM_NAME, "$PROGRAM_NAME", [Define my program name])
AC_DEFINE([_GNU_SOURCE], 1, AC_DEFINE([_GNU_SOURCE], 1,
[Define _GNU_SOURCE so that we get all necessary prototypes]) [Define _GNU_SOURCE so that we get all necessary prototypes])