Skip to content
This repository
Browse code

Tidy up the Makefile a bit.

  • Loading branch information...
commit 6a6506187ec6f1d0de45455c6c56e38e21bc349a 1 parent 78b913e
Stefan O'Rear sorear authored

Showing 1 changed file with 31 additions and 48 deletions. Show diff stats Hide diff stats

  1. +31 48 build/Makefile.in
79 build/Makefile.in
@@ -2,33 +2,48 @@
2 2 PARROT_ARGS =
3 3
4 4 ## configuration settings
5   -VERSION = @versiondir@
6 5 BIN_DIR = @bindir@
7   -LIB_DIR = @libdir@$(VERSION)
8   -DOC_DIR = @docdir@$(VERSION)
9   -MANDIR = @mandir@$(VERSION)
  6 +LIB_DIR = @libdir@$(VERSION_DIR)
  7 +DOC_DIR = @docdir@$(VERSION_DIR)
  8 +MAN_DIR = @mandir@$(VERSION_DIR)
  9 +VERSION_DIR = @versiondir@
  10 +INCLUDE_DIR = @includedir@$(VERSION_DIR)
  11 +SRC_DIR = @srcdir@$(VERSION_DIR)
  12 +TOOLS_DIR = @libdir@$(VERSION_DIR)/tools/lib
  13 +STAGING_DIR = dynext
  14 +#INSTALL_DIR = $(LIB_DIR)/languages/blizkost/dynext
  15 +INSTALL_DIR = $(LIB_DIR)/dynext
10 16
11 17 # Set up extensions
12 18 LOAD_EXT = @load_ext@
13 19 O = @o@
14 20
15 21 # Various paths
16   -PERL6GRAMMAR = $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
17   -NQP = $(LIB_DIR)/languages/nqp/nqp.pbc
18   -PCT = $(LIB_DIR)/library/PCT.pbc
19 22 PMC_DIR = src/pmc
20 23
21 24 ## Setup some commands
22   -PERL = @p5_perl@
23   -CAT = @cat@
  25 +CC = @cc@ -c
  26 +CC_OUT = @cc_o_out@
  27 +CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ @p5_ccopts@
24 28 CHMOD = @chmod@
25 29 CP = @cp@
  30 +LD = @ld@
  31 +LDFLAGS = @ldflags@ @ld_debug@ @libs@
  32 +LD_LOAD_FLAGS = @ld_load_flags@
  33 +LD_OUT = @ld_out@
  34 +LIBPARROT = @inst_libparrot_ldflags@
26 35 MKPATH = @mkpath@
27   -RM_F = @rm_f@
28   -RM_RF = @rm_rf@
29   -POD2MAN = pod2man
30 36 PARROT = $(BIN_DIR)/parrot@exe@
31 37 PBC_TO_EXE = $(BIN_DIR)/pbc_to_exe@exe@
  38 +PERL = @p5_perl@
  39 +POD2MAN = pod2man
  40 +RM_F = @rm_f@
  41 +RM_RF = @rm_rf@
  42 +PMC2C_INCLUDES = --include $(SRC_DIR) --include $(SRC_DIR)/pmc --include $(PMC_DIR)
  43 +PMC2C = $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl
  44 +INCLUDES = -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc
  45 +LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @p5_ldopts@
  46 +
32 47 #IF(darwin):
33 48 #IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
34 49 #IF(darwin):export MACOSX_DEPLOYMENT_TARGET = @osx_version@
@@ -40,7 +55,6 @@ DOCS = README
40 55
41 56 BUILD_CLEANUPS = \
42 57 perl5.pbc \
43   - "src/gen_*.pir" \
44 58 "*.c" \
45 59 "*$(O)" \
46 60 blizkost@exe@ \
@@ -51,32 +65,6 @@ BUILD_CLEANUPS = \
51 65
52 66 TEST_CLEANUPS =
53 67
54   -VERSION_DIR = @versiondir@
55   -INCLUDE_DIR = @includedir@$(VERSION_DIR)
56   -SRC_DIR = @srcdir@$(VERSION_DIR)
57   -TOOLS_DIR = @libdir@$(VERSION_DIR)/tools/lib
58   -STAGING_DIR = dynext
59   -#INSTALL_DIR = $(LIB_DIR)/languages/blizkost/dynext
60   -INSTALL_DIR = $(LIB_DIR)/dynext
61   -
62   -# Setup some commands
63   -CC = @cc@ -c
64   -LD = @ld@
65   -LDFLAGS = @ldflags@ @ld_debug@ @libs@
66   -LD_LOAD_FLAGS = @ld_load_flags@
67   -CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ @p5_ccopts@
68   -CC_OUT = @cc_o_out@
69   -LD_OUT = @ld_out@
70   -LIBPARROT = @inst_libparrot_ldflags@
71   -
72   -PMC2C_INCLUDES = --include $(SRC_DIR) --include $(SRC_DIR)/pmc --include $(PMC_DIR)
73   -PMC2C = $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl
74   -PMC2CD = $(PMC2C) --dump $(PMC2C_INCLUDES)
75   -PMC2CC = $(PMC2C) -c $(PMC2C_INCLUDES)
76   -
77   -INCLUDES = -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc
78   -LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @p5_ldopts@
79   -
80 68 BLIZKOST_GROUP = $(STAGING_DIR)/blizkost_group$(LOAD_EXT)
81 69
82 70 PMC_BLIZKOST_GROUP = blizkost_group
@@ -106,10 +94,10 @@ HEADERS = \
106 94 $(PMC_SOURCES:.pmc=.c)
107 95
108 96 CLEANUPS = \
109   - "src/pmc/*$(O)" \
110   - "src/pmc/p5*.c" \
  97 + "$(OBJS)" \
  98 + "$(PMC_SOURCES:.pmc=.c)" \
111 99 "src/pmc/pmc*.h" \
112   - "src/pmc/*.dump" \
  100 + "$(PMC_SOURCES:.pmc=.dump)" \
113 101 #IF(win32): "src/pmc/*.exp" \
114 102 #IF(win32): "src/pmc/*.ilk" \
115 103 #IF(win32): "src/pmc/*.manifext" \
@@ -139,9 +127,6 @@ blizkost@exe@: perl5.pbc
139 127 $(CHMOD) 0775 blizkost@exe@
140 128 #IF(win32): copy $(BIN_DIR)\libparrot.dll .
141 129
142   -src/gen_builtins.pir: build/gen_builtins_pir.pl
143   - $(PERL) build/gen_builtins_pir.pl $(BUILTINS_PIR) > src/gen_builtins.pir
144   -
145 130 installable: installable_blizkost@exe@
146 131
147 132 installable_blizkost@exe@: perl5.pbc
@@ -188,10 +173,8 @@ test-installable: installable
188 173 echo "1" | ./installable_blizkost@exe@
189 174
190 175 install: installable
191   -#IF(cygwin): CHMOD 0775 "src/pmc/*$(LOAD_EXT)"
192   -#IF(hpux): CHMOD 0775 "src/pmc/*$(LOAD_EXT)"
193 176 $(MKPATH) $(INSTALL_DIR)
194   - $(CP) "src/pmc/*$(LOAD_EXT)" $(INSTALL_DIR)
  177 + $(CP) $(BLIZKOST_GROUP) $(INSTALL_DIR)
195 178 $(CP) installable_blizkost@exe@ $(BIN_DIR)/parrot-blizkost@exe@
196 179 $(CHMOD) 0755 $(BIN_DIR)/parrot-blizkost@exe@
197 180 -$(MKPATH) $(LIB_DIR)/languages/perl5

0 comments on commit 6a65061

Please sign in to comment.
Something went wrong with that request. Please try again.