projects
/
shibboleth
/
cpp-xmltooling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken macro which was breaking the C++ build.
[shibboleth/cpp-xmltooling.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
c3c55a9
..
029cd5c
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,43
+1,37
@@
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
include doxygen.am
MOSTLYCLEANFILES = $(DX_CLEANFILES)
include doxygen.am
MOSTLYCLEANFILES = $(DX_CLEANFILES)
+DISTCLEANFILES = \
+ @PACKAGE_NAME@.pc \
+ @PACKAGE_NAME@.pc.in \
+ @PACKAGE_NAME@-uninstalled.pc \
+ @PACKAGE_NAME@-uninstalled.sh
+
dist-hook:
rm -rf `find $(distdir)/xmltoolingtest/data -name .svn`
rm -rf `find $(distdir)/doc/api -name .svn`
dist-hook:
rm -rf `find $(distdir)/xmltoolingtest/data -name .svn`
rm -rf `find $(distdir)/doc/api -name .svn`
-SUBDIRS = doc schemas xmltooling xmltoolingtest
-
-GENFILES = xmltooling.spec pkginfo Portfile
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
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
-$(GENFILES): %: %.in Makefile
- rm -f $@.tmp
- sed < $@.in > $@.tmp \
- -e 's:@-VERSION-@:${VERSION}:'
- mv $@.tmp $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec
EXTRA_DIST = $(DX_CONFIG) \
EXTRA_DIST = $(DX_CONFIG) \
- cpp-xmltooling.sln \
- acx_pthread.m4 \
- acinclude.m4 \
- libtool.m4 \
- doxygen.m4 \
- depcomp \
- config_win32.h \
- $(GENFILES) \
- $(GENFILES:%=%.in) \
- depend \
- postinstall
-
-DISTCLEANFILES = $(GENFILES)
+ cpp-@PACKAGE_NAME@.sln \
+ config_win32.h \
+ msbuild \
+ $(GENFILES) \
+ $(GENFILES:%=%.in)