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

pfelecan at users.sourceforge.net pfelecan at users.sourceforge.net
Sun Aug 4 15:35:02 CEST 2013


Revision: 21643
          http://gar.svn.sourceforge.net/gar/?rev=21643&view=rev
Author:   pfelecan
Date:     2013-08-04 13:35:00 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
qt4-gcc/trunk: solved the issue with private headers being included in
both -dev and -private-dev packages

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-08-04 13:01:15 UTC (rev 21642)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-08-04 13:35:00 UTC (rev 21643)
@@ -127,6 +127,15 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
 CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.$(VERSION)
 
+PACKAGES						+=	CSWqt4-private-dev
+CATALOGNAME_CSWqt4-private-dev	=	qt4_private_dev
+SPKG_DESC_CSWqt4-private-dev	=	$(DESCRIPTION), private development files
+PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtCore/private/.*
+PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtDeclarative/private/.*
+PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtGui/private/.*
+PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtScript/private/.*
+ARCHALL_CSWqt4-private-dev		=	1
+
 PACKAGES += CSWqt4-dev
 SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files
 PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL)
@@ -137,6 +146,7 @@
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/demos/.*
 PKGFILES_CSWqt4-dev += $(libdir)/$(NAME)$(MAJOR)/imports/.*
 PKGFILES_CSWqt4-dev += $(sharedstatedir)/$(NAME)$(MAJOR)/mkspecs/.*
+EXTRA_PKGFILES_EXCLUDED_CSWqt4-dev += $(PKGFILES_CSWqt4-private-dev)
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesignercomponents4
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesigner4
@@ -344,15 +354,6 @@
 ARCHALL_CSWqt4-doc = 1
 CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content
 
-PACKAGES						+=	CSWqt4-private-dev
-CATALOGNAME_CSWqt4-private-dev	=	qt4_private_dev
-SPKG_DESC_CSWqt4-private-dev	=	$(DESCRIPTION), private development
-PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtCore/private/.*
-PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtDeclarative/private/.*
-PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtGui/private/.*
-PKGFILES_CSWqt4-private-dev		+=	$(includedir)/QtScript/private/.*
-ARCHALL_CSWqt4-private-dev		=	1
-
 include gar/category.mk
 
 PATH:=:/opt/csw/gnu:$(PATH)

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



More information about the devel mailing list