[csw-devel] SF.net SVN: gar:[14809] csw/mgar/pkg/scintilla/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 14809
          http://gar.svn.sourceforge.net/gar/?rev=14809&view=rev
Author:   dmichelsen
Date:     2011-06-14 11:39:40 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
scintilla: Split packages, add compilation flags

Modified Paths:
--------------
    csw/mgar/pkg/scintilla/trunk/Makefile

Modified: csw/mgar/pkg/scintilla/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scintilla/trunk/Makefile	2011-06-14 11:28:00 UTC (rev 14808)
+++ csw/mgar/pkg/scintilla/trunk/Makefile	2011-06-14 11:39:40 UTC (rev 14809)
@@ -16,11 +16,24 @@
 
 LICENSE = License.txt
 
+PACKAGES += CSWlibscintilla2
+SPKG_DESC_CSWlibscintilla2 = Library source code editing component, libscintilla.so.2
+PKGFILES_CSWlibscintilla2 = $(call pkgfiles_lib,libscintilla.so.2)
+
+PACKAGES += CSWlibscintilla-dev
+SPKG_DESC_CSWlibscintilla-dev = Development files for libscintilla.so.2
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibscintilla-dev += CSWlibscintilla2
+RUNTIME_DEP_PKGS_CSWlibscintilla-dev += CSWpython
+
 WORKSRC = $(WORKDIR)/$(DISTNAME)/gtk
 
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+# pic13 is too small
+EXTRA_CXXFLAGS = -xcode=pic32
+
 # Ugh, manual makefile.
 CONFIGURE_SCRIPTS =
 
@@ -36,11 +49,12 @@
 
 include gar/category.mk
 
+install-custom: _LINK64=$(if $(filter 64,$(MEMORYMODEL)),-64,)
 install-custom:
 	mkdir -p $(DESTDIR)$(includedir)
 	cp $(WORKDIR)/$(DISTNAME)/include/* $(DESTDIR)$(includedir)
 	mkdir -p $(DESTDIR)$(libdir)
-	cd $(WORKDIR)/$(DISTNAME)/bin && ld -G -z allextract -h scintilla.so.2 scintilla.a  -o $(DESTDIR)$(libdir)/libscintilla.so.2.26
+	cd $(WORKDIR)/$(DISTNAME)/bin && ld $(_LINK64) -G -z allextract -h libscintilla.so.2 scintilla.a  -o $(DESTDIR)$(libdir)/libscintilla.so.2.26
 	ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so.2
 	ln -s libscintilla.so.2.26 $(DESTDIR)$(libdir)/libscintilla.so
 	@$(MAKECOOKIE)


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