Skip to content

Commit

Permalink
Building and the example are now working (if cblas is available).
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Mayr committed Oct 25, 2009
1 parent fa6912e commit 253ee99
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
15 changes: 12 additions & 3 deletions config/Makefile.in
Expand Up @@ -18,28 +18,34 @@ PERL_LIB = $(TOOLS_DIR)/lib
NQP = $(PARROT) $(LIB_DIR)/languages/nqp/nqp.pbc
PBC_TO_EXE = @bindir@/pbc_to_exe

LD = @ld@
LD_LOAD_FLAGS = -shared -O2 -g -fPIC
LINKARGS = $(LD_LOAD_FLAGS) -lblas

PARROT_DYNEXT = $(LIB_DIR)/dynext
PERL6GRAMMAR = $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
PCT = $(LIB_DIR)/PCT.pbc
PMC2C = $(PERL) $(TOOLS_DIR)/build/pmc2c.pl

GROUP = pla_group
GROUP = linalg_group
PMC_DIR = src/pmc
DYNPMC = $(PMC_DIR)/$(GROUP)$(LOAD_EXT)
DYNEXT_DIR = dynext

PMC2C_INCLUDES = --include $(PMC_DIR) --include $(SRC_DIR) --include $(SRC_DIR)/pmc

PMC_SOURCES = \
$(PMC_DIR)/nummatrix2d.pmc

all: $(DYNPMC)
all: $(DYNEXT_TARGET)

clean:
$(RM_F) /src/pmc/*$(O)
$(RM_F) /src/pmc/*$(DUMP)
$(RM_F) /src/pmc/*.c
$(RM_F) src/pmc/pmc_*.h
$(RM_F) pla_group.*
$(RM_F) $(GROUP).*
$(RM_F) dynext/*.$(LOAD_EXT)

realclean: clean
$(RM_F) Makefile
Expand All @@ -55,6 +61,9 @@ $(DYNPMC): $(PMC_SOURCES)
$(CC) -c -I$(PMC_DIR) -I$(INCLUDE_DIR) -I$(PMC_INCLUDE_DIR) $(CFLAGS) *.c
$(LD) @ld_out@$(DYNPMC) $(GROUP)$(O) src/pmc/*$(O) $(LINKARGS)

$(DYNEXT_TARGET): $(DYNPMC)
$(CP) $(DYNPMC) $(DYNEXT_DIR)/

# This is a listing of all targets, that are meant to be called by users
help:
@echo ""
Expand Down
1 change: 1 addition & 0 deletions dynext/IGNORE
@@ -0,0 +1 @@
Intentionally left blank.
2 changes: 1 addition & 1 deletion examples/add.pir
@@ -1,7 +1,7 @@
.sub main :main
.local pmc lib

lib = loadlib "NumMatrix2D"
lib = loadlib "linalg_group"
unless lib goto not_loaded
say "library loaded successfully."

Expand Down

0 comments on commit 253ee99

Please sign in to comment.