Skip to content

Commit

Permalink
* Updated configure scripts not to run doxygen.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cybergarage
cybergarage committed Sep 3, 2015
1 parent dc1d3c5 commit e9d3a91
Show file tree
Hide file tree
Showing 21 changed files with 320 additions and 161 deletions.
10 changes: 6 additions & 4 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ EXTRA_DIST = debian/changelog \
include/cybergarage/upnp/cupnp.h.in

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = clinkc.pc
pkgconfig_DATA = mupnp.pc

dist_docs_DATA = \
COPYING
Expand All @@ -28,9 +28,11 @@ dist_devdocs_DATA = \
COPYING \
Doxyfile

nobase_devdocs_DATA = \
doxygen/html/* \
doxygen-objc/html/*
#nobase_devdocs_DATA = \
# doxygen/html/* \
# doxygen-objc/html/*

doxygen: doxygen/html/* doxygen/html/*

doxygen/html/*:
cd $(srcdir) && doxygen Doxyfile
Expand Down
116 changes: 52 additions & 64 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand All @@ -15,7 +15,17 @@
@SET_MAKE@

VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
Expand Down Expand Up @@ -77,22 +87,18 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(srcdir)/clinkc.pc.in \
$(dist_devdocs_DATA) $(dist_docs_DATA) AUTHORS COPYING \
ChangeLog INSTALL NEWS README config/compile config/depcomp \
config/install-sh config/missing $(top_srcdir)/config/compile \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(dist_devdocs_DATA) $(dist_docs_DATA) \
$(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = clinkc.pc
CONFIG_CLEAN_FILES = mupnp.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
Expand Down Expand Up @@ -149,9 +155,8 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(devdocsdir)" "$(DESTDIR)$(docsdir)" \
"$(DESTDIR)$(devdocsdir)" "$(DESTDIR)$(pkgconfigdir)"
DATA = $(dist_devdocs_DATA) $(dist_docs_DATA) $(nobase_devdocs_DATA) \
$(pkgconfig_DATA)
"$(DESTDIR)$(pkgconfigdir)"
DATA = $(dist_devdocs_DATA) $(dist_docs_DATA) $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
Expand Down Expand Up @@ -182,6 +187,11 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = include lib examples tests
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/mupnp.pc.in $(top_srcdir)/config/compile \
$(top_srcdir)/config/install-sh $(top_srcdir)/config/missing \
AUTHORS COPYING ChangeLog INSTALL NEWS README config/compile \
config/depcomp config/install-sh config/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Expand Down Expand Up @@ -336,7 +346,7 @@ EXTRA_DIST = debian/changelog \
include/cybergarage/upnp/cupnp.h.in

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = clinkc.pc
pkgconfig_DATA = mupnp.pc
dist_docs_DATA = \
COPYING

Expand All @@ -345,10 +355,6 @@ dist_devdocs_DATA = \
COPYING \
Doxyfile

nobase_devdocs_DATA = \
doxygen/html/* \
doxygen-objc/html/*

all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

Expand All @@ -368,7 +374,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
Expand Down Expand Up @@ -402,7 +407,7 @@ $(srcdir)/config.h.in: $(am__configure_deps)

distclean-hdr:
-rm -f config.h stamp-h1
clinkc.pc: $(top_builddir)/config.status $(srcdir)/clinkc.pc.in
mupnp.pc: $(top_builddir)/config.status $(srcdir)/mupnp.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-dist_devdocsDATA: $(dist_devdocs_DATA)
@$(NORMAL_INSTALL)
Expand Down Expand Up @@ -446,30 +451,6 @@ uninstall-dist_docsDATA:
@list='$(dist_docs_DATA)'; test -n "$(docsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(docsdir)'; $(am__uninstall_files_from_dir)
install-nobase_devdocsDATA: $(nobase_devdocs_DATA)
@$(NORMAL_INSTALL)
@list='$(nobase_devdocs_DATA)'; test -n "$(devdocsdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(devdocsdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(devdocsdir)" || exit 1; \
fi; \
$(am__nobase_list) | while read dir files; do \
xfiles=; for file in $$files; do \
if test -f "$$file"; then xfiles="$$xfiles $$file"; \
else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
test -z "$$xfiles" || { \
test "x$$dir" = x. || { \
echo " $(MKDIR_P) '$(DESTDIR)$(devdocsdir)/$$dir'"; \
$(MKDIR_P) "$(DESTDIR)$(devdocsdir)/$$dir"; }; \
echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(devdocsdir)/$$dir'"; \
$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(devdocsdir)/$$dir" || exit $$?; }; \
done

uninstall-nobase_devdocsDATA:
@$(NORMAL_UNINSTALL)
@list='$(nobase_devdocs_DATA)'; test -n "$(devdocsdir)" || list=; \
$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
dir='$(DESTDIR)$(devdocsdir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
Expand Down Expand Up @@ -679,15 +660,15 @@ dist-xz: distdir
$(am__post_remove_distdir)

dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)

dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
Expand Down Expand Up @@ -723,17 +704,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
Expand Down Expand Up @@ -791,7 +772,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(devdocsdir)" "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(devdocsdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
for dir in "$(DESTDIR)$(devdocsdir)" "$(DESTDIR)$(docsdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
Expand Down Expand Up @@ -846,7 +827,7 @@ info: info-recursive
info-am:

install-data-am: install-dist_devdocsDATA install-dist_docsDATA \
install-nobase_devdocsDATA install-pkgconfigDATA
install-pkgconfigDATA

install-dvi: install-dvi-recursive

Expand Down Expand Up @@ -893,7 +874,7 @@ ps: ps-recursive
ps-am:

uninstall-am: uninstall-dist_devdocsDATA uninstall-dist_docsDATA \
uninstall-nobase_devdocsDATA uninstall-pkgconfigDATA
uninstall-pkgconfigDATA

.MAKE: $(am__recursive_targets) all install-am install-strip

Expand All @@ -907,15 +888,22 @@ uninstall-am: uninstall-dist_devdocsDATA uninstall-dist_docsDATA \
install-data install-data-am install-dist_devdocsDATA \
install-dist_docsDATA install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-nobase_devdocsDATA \
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-dist_devdocsDATA uninstall-dist_docsDATA \
uninstall-nobase_devdocsDATA uninstall-pkgconfigDATA
install-info-am install-man install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-dist_devdocsDATA \
uninstall-dist_docsDATA uninstall-pkgconfigDATA

.PRECIOUS: Makefile


#nobase_devdocs_DATA = \
# doxygen/html/* \
# doxygen-objc/html/*

doxygen: doxygen/html/* doxygen/html/*

doxygen/html/*:
cd $(srcdir) && doxygen Doxyfile
Expand Down
17 changes: 9 additions & 8 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
am__api_version='1.14'
am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
Expand Down Expand Up @@ -2413,8 +2413,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
Expand All @@ -2433,7 +2433,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
Expand Down Expand Up @@ -2761,8 +2761,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
Expand Down Expand Up @@ -2820,6 +2820,7 @@ END
fi
fi
##############################
# Constants
##############################
Expand Down Expand Up @@ -6420,7 +6421,7 @@ fi
# Makefiles
##############################
ac_config_files="$ac_config_files clinkc.pc Makefile include/Makefile lib/Makefile lib/unix/Makefile examples/Makefile examples/clock/Makefile examples/clock/unix/Makefile examples/upnpdump/Makefile examples/upnpdump/unix/Makefile examples/upnpavdump/Makefile examples/upnpavdump/unix/Makefile examples/upnpigddump/Makefile examples/upnpigddump/unix/Makefile tests/Makefile tests/unix/Makefile"
ac_config_files="$ac_config_files mupnp.pc Makefile include/Makefile lib/Makefile lib/unix/Makefile examples/Makefile examples/clock/Makefile examples/clock/unix/Makefile examples/upnpdump/Makefile examples/upnpdump/unix/Makefile examples/upnpavdump/Makefile examples/upnpavdump/unix/Makefile examples/upnpigddump/Makefile examples/upnpigddump/unix/Makefile tests/Makefile tests/unix/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -7160,7 +7161,7 @@ do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"clinkc.pc") CONFIG_FILES="$CONFIG_FILES clinkc.pc" ;;
"mupnp.pc") CONFIG_FILES="$CONFIG_FILES mupnp.pc" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ fi
##############################

AC_OUTPUT([
clinkc.pc
mupnp.pc
Makefile
include/Makefile
lib/Makefile
Expand Down
Loading

0 comments on commit e9d3a91

Please sign in to comment.