[svn:parrot] r40312 - trunk/examples/embed

[NotFound at svn.parrot.org]

Author: NotFound
Date: Tue Jul 28 20:39:09 2009
New Revision: 40312
URL: https://trac.parrot.org/parrot/changeset/40312

Log:
[examples] update and fix Makefile for cotorra (formerly lorito) to buid with an installed parrot

Modified:
   trunk/examples/embed/Makefile

Modified: trunk/examples/embed/Makefile
==============================================================================
--- trunk/examples/embed/Makefile	Tue Jul 28 19:35:41 2009	(r40311)
+++ trunk/examples/embed/Makefile	Tue Jul 28 20:39:09 2009	(r40312)
@@ -1,25 +1,27 @@
 # Copyright (C) 2009, Parrot Foundation.
 ## $Id$
 
-# To build this example in a parrot development environment:
-
-# PATH=/parrot_directory:$PATH
-# export LD_RUN_PATH=/parrot_directory/blib/lib
+# To build this example with an installed parrot:
+#
+# PATH=/parrot_install_directory/bin:$PATH
 # make
 
 # This assumes a posix environment with sh style shell.
 # May need changes with other shells or other make tools.
-# For MSVC use nmake -f Makefile.msvc
+# For MSVC use see nmake -f Makefile.msvc (may not be up-to-date)
 
 CC = $(shell parrot_config cc)
 CCFLAGS = $(shell parrot_config ccflags)
 LD = $(shell parrot_config ld)
 LD_OUT = $(shell parrot_config ld_out)
-LDFLAGS = $(shell parrot_config libparrot_ldflags)
+LINKFLAGS = $(shell parrot_config inst_libparrot_linkflags) $(shell parrot_config rpath_lib)
 O = $(shell parrot_config o)
 EXE = $(shell parrot_config exe)
-INCLUDEDIR = $(shell parrot_config prefix)/include
-CONFIG = $(shell parrot_config prefix)/src/parrot_config
+
+VERSIONDIR = $(shell parrot_config versiondir)
+INCLUDEDIR = $(shell parrot_config includedir)$(VERSIONDIR)
+LIBDIR = $(shell parrot_config libdir)$(VERSIONDIR)
+CONFIG = $(LIBDIR)/parrot_config
 
 all: cotorra$(EXE)
 
@@ -29,7 +31,7 @@
 	$(CC) $(CCFLAGS) -c -I $(INCLUDEDIR) cotorra.c
 
 cotorra$(EXE): cotorra$(O)
-	$(LD) $(LD_OUT)cotorra$(EXE) cotorra$(O) $(CONFIG)$(O) $(LDFLAGS)
+	$(LD) $(LD_OUT)cotorra$(EXE) cotorra$(O) $(CONFIG)$(O) $(LINKFLAGS)
 
 #-----------------------------------------------------------------------