[svn:parrot] r36777 - in trunk/languages/c99: . config/makefiles
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Sun Feb 15 22:37:57 UTC 2009
Author: fperrad
Date: Sun Feb 15 22:37:57 2009
New Revision: 36777
URL: https://trac.parrot.org/parrot/changeset/36777
Log:
[c99] improve Makefiles
Modified:
trunk/languages/c99/ (props changed)
trunk/languages/c99/config/makefiles/cpp.in
trunk/languages/c99/config/makefiles/root.in
Modified: trunk/languages/c99/config/makefiles/cpp.in
==============================================================================
--- trunk/languages/c99/config/makefiles/cpp.in Sun Feb 15 21:03:40 2009 (r36776)
+++ trunk/languages/c99/config/makefiles/cpp.in Sun Feb 15 22:37:57 2009 (r36777)
@@ -2,7 +2,7 @@
## $Id$
## arguments we want to run parrot with
-PARROT_ARGS =
+PARROT_ARGS =
## configuration settings
BUILD_DIR = @build_dir@
@@ -10,12 +10,11 @@
O = @o@
## Setup some commands
-LN_S = @lns@
PERL = @perl@
-RM_RF = @rm_rf@
+RM_F = @rm_f@
CP = @cp@
-PARROT = ../../../../parrot at exe@
CAT = @cat@
+PARROT = ../../../../parrot at exe@
BUILD_DYNPMC = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
RECONFIGURE = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
@@ -30,23 +29,18 @@
all: cpp.pbc
-C_GROUP = $(PMC_DIR)/c_group$(LOAD_EXT)
-
SOURCES = cpp.pir \
src/gen_grammar.pir \
src/gen_actions.pir \
- src/gen_builtins.pir \
-# $(C_GROUP)
+ src/gen_builtins.pir
BUILTINS_PIR = \
- src/builtins/say.pir \
-
-# PMCS = c
-# PMC_SOURCES = $(PMC_DIR)/c.pmc
+ src/builtins/say.pir
# the default target
cpp.pbc: $(PARROT) $(SOURCES)
$(PARROT) $(PARROT_ARGS) -o cpp.pbc cpp.pir
+ $(CP) cpp.pbc ../../cpp.pbc
src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
@@ -60,12 +54,6 @@
src/gen_builtins.pir: $(BUILTINS_PIR)
$(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
-$(C_GROUP): $(PARROT) $(PMC_SOURCES)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) generate $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) compile $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
-
# regenerate the Makefile
Makefile: ../../config/makefiles/cpp.in
cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=c99
@@ -98,26 +86,13 @@
CLEANUPS = \
cpp.pbc \
- src/gen_grammar.pir \
- src/gen_actions.pir \
- src/gen_builtins.pir \
- $(PMC_DIR)/*.h \
- $(PMC_DIR)/*.c \
- $(PMC_DIR)/*.dump \
- $(PMC_DIR)/*$(O) \
- $(PMC_DIR)/*$(LOAD_EXT) \
- $(PMC_DIR)/*.exp \
- $(PMC_DIR)/*.ilk \
- $(PMC_DIR)/*.manifest \
- $(PMC_DIR)/*.pdb \
- $(PMC_DIR)/*.lib \
-
+ "src/gen_*.pir"
clean:
- $(RM_RF) $(CLEANUPS)
+ $(RM_F) $(CLEANUPS)
realclean: clean
- $(RM_RF) Makefile
+ $(RM_F) Makefile
distclean: realclean
Modified: trunk/languages/c99/config/makefiles/root.in
==============================================================================
--- trunk/languages/c99/config/makefiles/root.in Sun Feb 15 21:03:40 2009 (r36776)
+++ trunk/languages/c99/config/makefiles/root.in Sun Feb 15 22:37:57 2009 (r36777)
@@ -2,7 +2,7 @@
## $Id$
## arguments we want to run parrot with
-PARROT_ARGS =
+PARROT_ARGS =
## configuration settings
BUILD_DIR = @build_dir@
@@ -10,17 +10,17 @@
O = @o@
## Setup some commands
-LN_S = @lns@
PERL = @perl@
RM_RF = @rm_rf@
CP = @cp@
-PARROT = ../../parrot at exe@
CAT = @cat@
+MAKE = @make_c@
+PARROT = ../../parrot at exe@
BUILD_DYNPMC = $(PERL) $(BUILD_DIR)/tools/build/dynpmc.pl
RECONFIGURE = $(PERL) $(BUILD_DIR)/tools/dev/reconfigure.pl
-#CONDITIONED_LINE(darwin):
-#CONDITIONED_LINE(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
-#CONDITIONED_LINE(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
+#IF(darwin):
+#IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
+#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
## places to look for things
PARROT_DYNEXT = $(BUILD_DIR)/runtime/parrot/dynext
@@ -31,26 +31,20 @@
PMC_DIR = src/pmc
-all: c99.pbc
+all: c99.pbc cpp
C_GROUP = $(PMC_DIR)/c_group$(LOAD_EXT)
SOURCES = c99.pir \
src/gen_grammar.pir \
src/gen_actions.pir \
- src/gen_builtins.pir \
-# $(C_GROUP)
+ src/gen_builtins.pir
BUILTINS_PIR = \
- src/builtins/say.pir \
-
-# PMCS = c
-# PMC_SOURCES = $(PMC_DIR)/c.pmc
+ src/builtins/say.pir
-# the default target
c99.pbc: $(PARROT) $(SOURCES)
$(PARROT) $(PARROT_ARGS) -o c99.pbc c99.pir
- cd src/cpp; $(MAKE)
src/gen_grammar.pir: $(PERL6GRAMMAR) src/parser/grammar.pg
$(PARROT) $(PARROT_ARGS) $(PERL6GRAMMAR) \
@@ -64,15 +58,12 @@
src/gen_builtins.pir: $(BUILTINS_PIR)
$(CAT) $(BUILTINS_PIR) >src/gen_builtins.pir
-$(C_GROUP): $(PARROT) $(PMC_SOURCES)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) generate $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) compile $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
- cd $(PMC_DIR) && $(BUILD_DYNPMC) copy --destination=$(PARROT_DYNEXT) $(PMCS)
+cpp:
+ $(MAKE) src/cpp
# regenerate the Makefile
Makefile: config/makefiles/root.in
- cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=c
+ cd $(BUILD_DIR) && $(RECONFIGURE) --step=gen::languages --languages=c99
# This is a listing of all targets, that are meant to be called by users
help:
@@ -96,38 +87,25 @@
test: all
$(PERL) t/harness
+ $(MAKE) src/cpp test
# this target has nothing to do
testclean:
CLEANUPS = \
c99.pbc \
- src/gen_grammar.pir \
- src/gen_actions.pir \
- src/gen_builtins.pir \
- $(PMC_DIR)/*.h \
- $(PMC_DIR)/*.c \
- $(PMC_DIR)/*.dump \
- $(PMC_DIR)/*$(O) \
- $(PMC_DIR)/*$(LOAD_EXT) \
- $(PMC_DIR)/*.exp \
- $(PMC_DIR)/*.ilk \
- $(PMC_DIR)/*.manifest \
- $(PMC_DIR)/*.pdb \
- $(PMC_DIR)/*.lib \
- src/cpp/cpp.pbc \
- src/cpp/src/gen_actions.pir \
- src/cpp/src/gen_grammar.pir \
- src/cpp/src/gen_builtins.pir
-
+ "src/gen_*.pir"
clean:
$(RM_RF) $(CLEANUPS)
+ $(MAKE) src/cpp clean
realclean: clean
- $(RM_RF) Makefile src/cpp/Makefile
+ $(RM_RF) Makefile
+ $(MAKE) src/cpp realclean
distclean: realclean
+ $(MAKE) src/cpp distclean
# Local variables:
# mode: makefile
More information about the parrot-commits
mailing list