[Libreoffice-commits] core.git: 3 commits - configure.ac Makefile.in odk/CustomTarget_doxygen.mk solenv/gbuild

[Peter Foley]

 Makefile.in                 |   43 ++++++++++++++++++++++++++++++++++++-------
 configure.ac                |    3 ++-
 odk/CustomTarget_doxygen.mk |    4 ++--
 solenv/gbuild/Module.mk     |    1 +
 4 files changed, 41 insertions(+), 10 deletions(-)

New commits:
commit 7b7c7b03df24097b012a20227124811ac555a1f6
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Mar 3 09:01:33 2013 -0500

    doxygen fixes
    
    Change-Id: I18dd661bffc2dedecf13404b6772fb4dcdeaa24d

diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 7c4571a..0212508 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -27,7 +27,7 @@ odk_INCFILELIST := com/sun/star/uno/Any.h \
 	com/sun/star/uno/Type.hxx
 
 # Cygwin Doxygen needs unix paths
-DOXY_INPUT := $(docu_SRCDIR)/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
+DOXY_INPUT := $(SRCDIR)/odk/pack/gendocu/main.dox $(addprefix $(OUTDIR)/inc/,$(odk_INCDIRLIST) $(odk_INCFILELIST))
 DOXY_INPUT := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(DOXY_INPUT)),$(DOXY_INPUT))
 DOXY_WORKDIR := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(odk_WORKDIR)/docs/cpp/ref),$(odk_WORKDIR)/docs/cpp/ref)
 DOXY_STRIP_PATH := $(if $(filter WNT,$(OS)),$(shell cygpath -u $(OUTDIR)/inc),$(OUTDIR)/inc)
@@ -48,7 +48,7 @@ $(odk_WORKDIR)/docs/cpp/ref/index.html: $(DOXY_DEPS)
 	sed -e 's!^INPUT = %$$!INPUT = $(DOXY_INPUT)!' \
 	-e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DOXY_WORKDIR)!' \
 	-e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
-        -e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),YES,NO)!' \
+        -e 's!^QUIET = %$$!QUIET = $(if $(VERBOSE),NO,YES)!' \
         -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(DOXY_STRIP_PATH)!' \
 	$< > $(odk_WORKDIR)/Doxyfile
 	$(DOXYGEN) $(odk_WORKDIR)/Doxyfile > /dev/null
commit 96017f081f166c7c5649c43ad4f455f2c7805713
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Mar 2 18:48:33 2013 -0500

    fixup configure output
    
    Change-Id: I1ec6261e1f5a34a9c1f00d874aa5191368034f4c

diff --git a/configure.ac b/configure.ac
index 62d2f78..ed90a4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5039,8 +5039,9 @@ if test "$GXX" = "yes"; then
     dnl see https://code.google.com/p/android/issues/detail?id=41770
     if test "$_gpp_majmin" -ge "407"; then
             glibcxx_threads=no
-            AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
             AC_LANG_PUSH([C++])
+            AC_REQUIRE_CPP
+            AC_MSG_CHECKING([whether $CXX is broken with boost.thread])
             AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
                 #include <bits/c++config.h>]],[[
                 #if !defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
commit ac3e90b596170c31073c36cb9473aee6d59fbdde
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sat Mar 2 13:06:22 2013 -0500

    build userfriendly targets from toplevel
    
    Change-Id: Iffbe6d4570bf4d4bdd7347260a6bb4160af24515

diff --git a/Makefile.in b/Makefile.in
index 208f619..eb67dad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,13 +84,42 @@ endef
 
 $(eval $(call gbuild_modules_rules,$(filter-out Module%,$(subst /, ,$(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk))))))
 
-# run a JunitTest - relies on naming convention (module prefix)
-$(WORKDIR)/JunitTest/%/done :
-	cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
-
-# run a CppunitTest - relies on naming convention (module prefix)
-$(WORKDIR)/CppunitTest/%.test :
-	cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
+gbuild_TARGETS := AllLangHelp \
+	AllLangResTarget \
+	AllLangZip \
+	AutoInstallLibs \
+	CliLibrary \
+	CliNativeLibrary \
+	CliUnoApiTarget \
+	Configuration \
+	CppunitTest \
+	CustomTarget \
+	Dictionary \
+	Executable \
+	Extension \
+	ExternalPackage \
+	ExternalProject \
+	InstallModule \
+	InstallScript \
+	InternalUnoApi \
+	Jar \
+	JunitTest \
+	Library \
+	Module \
+	Package \
+	Pagein \
+	Pyuno \
+	Rdb \
+	StaticLibrary \
+	UI \
+	UnoApi \
+	UnoApiMerge \
+	UnpackedTarball \
+	WinResTarget \
+	Zip
+# build a generic gbuild target
+$(foreach target,$(gbuild_TARGETS),$(target)_%):
+	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.build $@
 
 #
 # Clean
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 926aeae..0e694e5 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -164,6 +164,7 @@ gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_tar
 gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1)) $(gb_Module_CLEANTARGETSTACK)
 gb_Module_CURRENTMODULE_DEBUG_ENABLED := $(call gb_Module__debug_enabled,$(1))
 gb_Module_CURRENTMODULE_NAME := $(1)
+$(call gb_Helper_make_userfriendly_targets,$(1),Module)
 
 endef