projects
/
shibboleth
/
cpp-sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
https://issues.shibboleth.net/jira/browse/SSPCPP-589
[shibboleth/cpp-sp.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
69dd195
..
4fb593f
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,6
+1,5
@@
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
include doxygen.am
include doxygen.am
@@
-10,38
+9,33
@@
WANT_SUBDIRS = @WANT_SUBDIRS@
SUBDIRS = $(WANT_SUBDIRS)
SUBDIRS = $(WANT_SUBDIRS)
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
-
-GENFILES = shibboleth.spec pkginfo Portfile
+DIST_SUBDIRS = \
+ doc \
+ schemas \
+ configs \
+ shibsp \
+ shibd \
+ adfs \
+ plugins \
+ util \
+ apache \
+ nsapi_shib \
+ fastcgi \
+ odbc-store \
+ memcache-store \
+ selinux
if DX_COND_doc
if DX_COND_doc
-all-local: doxygen-doc
$(GENFILES)
+all-local: doxygen-doc
else
else
-all-local:
$(GENFILES)
+all-local:
endif
endif
-dist-hook:
- rm -rf `find $(distdir)/isapi_shib -name .svn`
- rm -rf `find $(distdir)/doc/api -name .svn`
-
-$(GENFILES): %: %.in Makefile
- rm -f $@.tmp
- sed < $@.in > $@.tmp \
- -e 's:@-VERSION-@:${VERSION}:'
- mv $@.tmp $@
-
+GENFILES = @PACKAGE_NAME@.spec
EXTRA_DIST = $(DX_CONFIG) \
EXTRA_DIST = $(DX_CONFIG) \
- isapi_shib \
- Shibboleth.sln \
- libtool.m4 \
- doxygen.m4 \
- acx_pthread.m4 \
- depcomp \
- config_win32.h \
- $(GENFILES) \
- $(GENFILES:%=%.in) \
- depend \
- postinstall
-
-DISTCLEANFILES = $(GENFILES)
+ isapi_shib \
+ Shibboleth.sln \
+ config_win32.h \
+ $(GENFILES) \
+ $(GENFILES:%=%.in)