giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More separate srcdir fixups 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3450 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
alonbl 2008-04-01 19:04:33 +00:00
parent 39abe22798
commit 87db3c96c2
21 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -2,11 +2,13 @@ AUTOMAKE_OPTIONS = foreign 1.10
ACLOCAL_AMFLAGS = -I aclocal ACLOCAL_AMFLAGS = -I aclocal
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
Makefile.in config.h.in config.h.in~ configure \ config.log config.status \
install-sh ltmain.sh missing mkinstalldirs \ $(srcdir)/Makefile.in \
compile depcomp config.log config.status \ $(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
config.guess config.sub acinclude.m4 aclocal.m4 \ $(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
packaged $(srcdir)/depcomp $(srcdir)/aclocal.m4 \
$(srcdir)/config.guess $(srcdir)/config.sub \
$(srcdir)/packaged
EXTRA_DIST = Makefile.mak svnignore EXTRA_DIST = Makefile.mak svnignore
SUBDIRS = aclocal etc src win32 doc SUBDIRS = aclocal etc src win32 doc

2
aclocal/Makefile.am
View File

@ -1,2 +1,2 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = acx_pthread.m4 libassuan.m4 EXTRA_DIST = acx_pthread.m4 libassuan.m4

2
configure.ac
View File

@ -33,7 +33,7 @@ PKG_PROG_PKG_CONFIG
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_MSG_CHECKING([svn checkout]) AC_MSG_CHECKING([svn checkout])
if test -e packaged; then if test -e "${srcdir}/packaged"; then
svn_checkout="no" svn_checkout="no"
else else
svn_checkout="yes" svn_checkout="yes"

5
doc/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
wikidir=$(htmldir)/wiki wikidir=$(htmldir)/wiki
@ -79,4 +79,5 @@ endif
endif endif
maintainer-clean-local: maintainer-clean-local:
rm -rf html.out html.tmp man.out man.tmp api.work rm -rf "$(srcdir)/html.out" "$(srcdir)/man.out" \
html.out html.tmp man.out man.tmp api.work

10
doc/nonpersistent/Makefile.am
View File

@ -1,4 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in ChangeLog ChangeLog.tmp MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in $(srcdir)/ChangeLog \
ChangeLog ChangeLog.tmp
wikidir=$(htmldir)/wiki wikidir=$(htmldir)/wiki
@ -13,8 +15,8 @@ wiki.out/*:
test -n "$(WGET)" -a -n "$(SED)" -a -n "$(TR)" -a -n "$(XSLTPROC)" test -n "$(WGET)" -a -n "$(SED)" -a -n "$(TR)" -a -n "$(XSLTPROC)"
WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \ WGET="$(WGET)" WGET_OPTS="$(WGET_OPTS)" SED="$(SED)" TR="$(TR)" XSLTPROC="$(XSLTPROC)" \
PROJECT="@PACKAGE_NAME@" \ PROJECT="@PACKAGE_NAME@" \
$(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "$(builddir)/wiki.tmp" $(SHELL) "$(srcdir)/export-wiki.sh" "$(srcdir)" "wiki.tmp"
mv "$(srcdir)/wiki.tmp" wiki.out mv wiki.tmp wiki.out
ChangeLog: ChangeLog:
test -n "$(SVN)" -a -n "$(XSLTPROC)" test -n "$(SVN)" -a -n "$(XSLTPROC)"
@ -33,4 +35,4 @@ ChangeLog:
endif endif
maintainer-clean-local: maintainer-clean-local:
rm -rf wiki.out wiki.tmp rm -rf $(srcdir)/wiki.out wiki.out wiki.tmp

8
etc/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = opensc.conf DISTCLEANFILES = opensc.conf
SUFFIXES = .in SUFFIXES = .in
@ -11,8 +11,8 @@ nodist_noinst_DATA = opensc.conf
sysconf_DATA=#required in order to create dir sysconf_DATA=#required in order to create dir
install-exec-hook: install-sysconfDATA opensc.conf install-exec-hook: install-sysconfDATA opensc.conf
if [ -f $(DESTDIR)$(sysconfdir)/opensc.conf ]; then \ if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
$(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf.new; \ $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
else \ else \
$(INSTALL_DATA) opensc.conf $(DESTDIR)$(sysconfdir)/opensc.conf; \ $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf"; \
fi fi

2
src/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak
# Order IS important # Order IS important

2
src/common/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak
noinst_LTLIBRARIES = libcompat.la noinst_LTLIBRARIES = libcompat.la

2
src/include/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Makefile.mak winconfig.h EXTRA_DIST = Makefile.mak winconfig.h
SUBDIRS = opensc SUBDIRS = opensc

2
src/include/opensc/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = svnignore EXTRA_DIST = svnignore
all-local: all-local:

2
src/libopensc/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = versioninfo.rc CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

2
src/openssh/Makefile.am
View File

@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
dist_noinst_DATA = README ask-for-pin.diff dist_noinst_DATA = README ask-for-pin.diff

2
src/pkcs11/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = versioninfo.rc CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

2
src/pkcs15init/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = versioninfo.rc CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

2
src/scconf/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
DISTCLEANFILES = lex-parse.c DISTCLEANFILES = lex-parse.c
CLEANFILES = versioninfo.rc CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

2
src/signer/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
SUBDIRS = npinclude SUBDIRS = npinclude
if ENABLE_NSPLUGIN if ENABLE_NSPLUGIN

2
src/signer/npinclude/Makefile.am
View File

@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
noinst_HEADERS = jri.h jri_md.h jritypes.h npapi.h npunix.c npupp.h noinst_HEADERS = jri.h jri_md.h jritypes.h npapi.h npunix.c npupp.h

2
src/tests/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak
SUBDIRS = regression SUBDIRS = regression

4
src/tests/regression/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
dist_noinst_DATA = \ dist_noinst_DATA = \
crypt0001 crypt0002 crypt0003 crypt0004 crypt0005 crypt0006 crypt0007 \ crypt0001 crypt0002 crypt0003 crypt0004 crypt0005 crypt0006 crypt0007 \
@ -9,5 +9,5 @@ dist_noinst_DATA = \
dist_noinst_SCRIPTS = erase functions run-all dist_noinst_SCRIPTS = erase functions run-all
# remove log files from regression tests # remove log files from regression tests
maintainer-clean-local: clean-local:
-rm -rf out failed -rm -rf out failed

2
src/tools/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/win32/ltrc.inc include $(top_srcdir)/win32/ltrc.inc
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
CLEANFILES = versioninfo.rc CLEANFILES = versioninfo.rc
EXTRA_DIST = Makefile.mak EXTRA_DIST = Makefile.mak

2
win32/Makefile.am
View File

@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
EXTRA_DIST = Make.rules.mak Makefile.mak EXTRA_DIST = Make.rules.mak Makefile.mak
dist_noinst_SCRIPTS = makedef.pl dist_noinst_SCRIPTS = makedef.pl