SF.net SVN: gar:[22576] csw/mgar/pkg/qt4-gcc/trunk/Makefile

[pfelecan at users.sourceforge.net]

Revision: 22576
          http://gar.svn.sourceforge.net/gar/?rev=22576&view=rev
Author:   pfelecan
Date:     2013-11-25 17:55:53 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
qt4-gcc/trunk: force inclusion of the missing libQtUiTools.a in the
development package; solves 5122

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-11-25 14:58:39 UTC (rev 22575)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-11-25 17:55:53 UTC (rev 22576)
@@ -171,7 +171,14 @@
 PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*)
 PKGFILES_CSWqt4-dev += $(libdir)/libQt.*\.prl
-PKGFILES_CSWqt4-dev += $(libdir)/libQtUiTools.a
+# to provide a static library we need to do this:
+MERGE_EXCLUDE_STATICLIBS =
+# but to exclude those static libraries that we don't wish to provide,
+# we do this:
+EXTRA_MERGE_EXCLUDE_FILES	+=	/opt/csw/lib/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a
+EXTRA_MERGE_EXCLUDE_FILES	+=	/opt/csw/lib/qt4/demos/shared/libdemo_shared.a
+# finally, we do this:
+PKGFILES_CSWqt4-dev += $(libdir)/libQtUiTools\.a
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/examples/.*
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/plugins/.*
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/demos/.*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.