From 7fad957effac163d8746138884203f8466337d20 Mon Sep 17 00:00:00 2001 From: Stefan O'Rear Date: Sat, 24 Apr 2010 20:08:53 -0700 Subject: [PATCH] Merge the Makefiles --- Configure.pl | 1 - build/Makefile.in | 116 +++++++++++++++++++++++++++++++++-- build/src/pmc/Makefile.in | 126 -------------------------------------- 3 files changed, 110 insertions(+), 133 deletions(-) delete mode 100644 build/src/pmc/Makefile.in diff --git a/Configure.pl b/Configure.pl index 4433dfb..2e4d39e 100644 --- a/Configure.pl +++ b/Configure.pl @@ -59,7 +59,6 @@ =head1 SYNOPSIS # Create the Makefile using the information we just got create_makefile('Makefile' => %config); -create_makefile('src/pmc/Makefile' => %config); sub read_parrot_config { my @parrot_config_exe = @_; diff --git a/build/Makefile.in b/build/Makefile.in index 003cb62..4fb9e46 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -37,7 +37,6 @@ PBC_TO_EXE = $(BIN_DIR)/pbc_to_exe@exe@ BLIZKOST_GROUP = $(PMC_DIR)/blizkost_group$(LOAD_EXT) PMC_DEPS = \ - build/src/pmc/Makefile.in \ $(PMC_DIR)/p5sv.pmc \ $(PMC_DIR)/p5interpreter.pmc \ $(PMC_DIR)/p5namespace.pmc \ @@ -80,7 +79,7 @@ blizkost@exe@: perl5.pbc #IF(win32): copy $(BIN_DIR)\libparrot.dll . $(BLIZKOST_GROUP): $(PMC_DEPS) - $(MAKE) -f $(PMC_DIR)/Makefile pmc_all + $(MAKE) pmc_all src/gen_builtins.pir: build/gen_builtins_pir.pl @@ -132,7 +131,7 @@ test-installable: installable echo "1" | ./installable_blizkost@exe@ install: installable - $(MAKE) -f $(PMC_DIR)/Makefile pmc_install + $(MAKE) pmc_install $(CP) installable_blizkost@exe@ $(BIN_DIR)/parrot-blizkost@exe@ $(CHMOD) 0755 $(BIN_DIR)/parrot-blizkost@exe@ -$(MKPATH) $(LIB_DIR)/languages/perl5 @@ -142,7 +141,7 @@ install: installable $(CP) $(DOCS) $(DOC_DIR)/languages/perl5 uninstall: - $(MAKE) -f $(PMC_DIR)/Makefile pmc_uninstall + $(MAKE) pmc_uninstall $(RM_F) $(BIN_DIR)/parrot-blizkost@exe@ $(RM_RF) $(LIB_DIR)/languages/perl5 $(RM_F) $(MANDIR)/man1/parrot-blizkost.1 @@ -162,15 +161,120 @@ testclean: $(RM_F) $(TEST_CLEANUPS) clean: - $(MAKE) -f $(PMC_DIR)/Makefile pmc_clean + $(MAKE) pmc_clean $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) realclean: - $(MAKE) -f $(PMC_DIR)/Makefile pmc_realclean + $(MAKE) pmc_realclean $(RM_F) $(TEST_CLEANUPS) $(BUILD_CLEANUPS) Makefile distclean: realclean +VERSION_DIR = @versiondir@ +INCLUDE_DIR = @includedir@$(VERSION_DIR) +SRC_DIR = @srcdir@$(VERSION_DIR) +TOOLS_DIR = @libdir@$(VERSION_DIR)/tools/lib +STAGING_DIR = dynext +#INSTALL_DIR = $(LIB_DIR)/languages/blizkost/dynext +INSTALL_DIR = $(LIB_DIR)/dynext + +# Setup some commands +CC = @cc@ -c +LD = @ld@ +LDFLAGS = @ldflags@ @ld_debug@ @libs@ +LD_LOAD_FLAGS = @ld_load_flags@ +CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ @p5_ccopts@ +CC_OUT = @cc_o_out@ +LD_OUT = @ld_out@ +LIBPARROT = @inst_libparrot_ldflags@ + +PMC2C_INCLUDES = --include $(SRC_DIR) --include $(SRC_DIR)/pmc --include $(PMC_DIR) +PMC2C = $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl +PMC2CD = $(PMC2C) --dump $(PMC2C_INCLUDES) +PMC2CC = $(PMC2C) -c $(PMC2C_INCLUDES) + +INCLUDES = -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc +LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @p5_ldopts@ + +PMC_BLIZKOST_GROUP = blizkost_group + +PMC_SOURCES = \ + src/pmc/p5sv.pmc \ + src/pmc/p5interpreter.pmc \ + src/pmc/p5scalar.pmc \ + src/pmc/p5hashiter.pmc \ + src/pmc/p5namespace.pmc \ + src/pmc/p5invocation.pmc + +PMC_C = $(PMC_SOURCES:.pmc=.c) +PMC_DUMP = $(PMC_SOURCES:.pmc=.dump) + +OBJS = \ + src/pmc/lib-$(PMC_BLIZKOST_GROUP)$(O) \ + src/pmc/bkmarshal$(O) \ + $(PMC_SOURCES:.pmc=@o@) + +CLEANUPS = \ + "src/pmc/*$(LOAD_EXT)" \ + "src/pmc/*$(O)" \ + "src/pmc/p5*.c" \ + "src/pmc/pmc*.h" \ + "src/pmc/*.dump" \ +#IF(win32): "src/pmc/*.exp" \ +#IF(win32): "src/pmc/*.ilk" \ +#IF(win32): "src/pmc/*.manifext" \ +#IF(win32): "src/pmc/*.pdb" \ +#IF(win32): "src/pmc/*.lib" \ + $(STAGING_DIR)/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) + +pmc_all: pmc_staging + +src/pmc/init_with_xs.h: + $(PERL) -MExtUtils::Embed -e xsinit -- -o src/pmc/init_with_xs.h + +.SUFFIXES : .pmc .dump + +.pmc.dump: + $(PMC2C) --no-lines --dump $(PMC2C_INCLUDES) $< +.pmc.c: + $(PMC2C) --no-lines -c $(PMC2C_INCLUDES) $< + +pmc_generate: src/pmc/init_with_xs.h $(PMC_SOURCES) $(PMC_DUMP) $(PMC_C) + $(PMC2C) --no-lines --library $(PMC_DIR)/$(PMC_BLIZKOST_GROUP) -c $(PMC_SOURCES) + +pmc_compile: pmc_generate + $(CC) $(CC_OUT)src/pmc/p5sv$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5sv.c + $(CC) $(CC_OUT)src/pmc/p5scalar$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5scalar.c + $(CC) $(CC_OUT)src/pmc/p5namespace$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5namespace.c + $(CC) $(CC_OUT)src/pmc/p5interpreter$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5interpreter.c + $(CC) $(CC_OUT)src/pmc/p5invocation$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5invocation.c + $(CC) $(CC_OUT)src/pmc/p5hashiter$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5hashiter.c + $(CC) $(CC_OUT)src/pmc/lib-$(PMC_BLIZKOST_GROUP)$(O) $(INCLUDES) $(CFLAGS) src/pmc/$(PMC_BLIZKOST_GROUP).c + $(CC) $(CC_OUT)src/pmc/bkmarshal$(O) $(INCLUDES) $(CFLAGS) src/pmc/bkmarshal.c + +pmc_linklibs: pmc_compile + $(LD) $(LD_OUT)src/pmc/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) $(OBJS) $(LINKARGS) + +pmc_staging: pmc_linklibs +#IF(cygwin): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" +#IF(hpux): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" + $(CP) "src/pmc/*$(LOAD_EXT)" $(STAGING_DIR) + +pmc_install: +#IF(cygwin): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" +#IF(hpux): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" + $(MKPATH) $(INSTALL_DIR) + $(CP) "src/pmc/*$(LOAD_EXT)" $(INSTALL_DIR) + +pmc_uninstall: + $(RM_F) $(INSTALL_DIR)/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) + +pmc_clean: + $(RM_F) $(CLEANUPS) + +pmc_realclean: + $(RM_F) $(CLEANUPS) + # Local variables: # mode: makefile # End: diff --git a/build/src/pmc/Makefile.in b/build/src/pmc/Makefile.in deleted file mode 100644 index 087aa07..0000000 --- a/build/src/pmc/Makefile.in +++ /dev/null @@ -1,126 +0,0 @@ -## $Id$ - -# values from parrot_config -VERSION_DIR = @versiondir@ -INCLUDE_DIR = @includedir@$(VERSION_DIR) -LIB_DIR = @libdir@$(VERSION_DIR) -SRC_DIR = @srcdir@$(VERSION_DIR) -TOOLS_DIR = @libdir@$(VERSION_DIR)/tools/lib -STAGING_DIR = dynext -#INSTALL_DIR = $(LIB_DIR)/languages/blizkost/dynext -INSTALL_DIR = $(LIB_DIR)/dynext - -# Set up extensions -LOAD_EXT = @load_ext@ -O = @o@ - -# Setup some commands -PERL = @p5_perl@ -RM_F = @rm_f@ -MKPATH = @mkpath@ -CHMOD = @chmod@ -CP = @cp@ -CC = @cc@ -c -LD = @ld@ -LDFLAGS = @ldflags@ @ld_debug@ @libs@ -LD_LOAD_FLAGS = @ld_load_flags@ -CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ @p5_ccopts@ -CC_OUT = @cc_o_out@ -LD_OUT = @ld_out@ -LIBPARROT = @inst_libparrot_ldflags@ - -PMC2C_INCLUDES = --include $(SRC_DIR) --include $(SRC_DIR)/pmc -PMC2C = $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl -PMC2CD = $(PMC2C) --dump $(PMC2C_INCLUDES) -PMC2CC = $(PMC2C) -c $(PMC2C_INCLUDES) - -INCLUDES = -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/pmc -LINKARGS = $(LDFLAGS) $(LD_LOAD_FLAGS) $(LIBPARROT) @p5_ldopts@ - -PMC_BLIZKOST_GROUP = blizkost_group - -PMC_SOURCES = \ - src/pmc/p5sv.pmc \ - src/pmc/p5interpreter.pmc \ - src/pmc/p5scalar.pmc \ - src/pmc/p5hashiter.pmc \ - src/pmc/p5namespace.pmc \ - src/pmc/p5invocation.pmc - -PMC_C = $(PMC_SOURCES:.pmc=.c) -PMC_DUMP = $(PMC_SOURCES:.pmc=.dump) - -OBJS = \ - src/pmc/lib-$(PMC_BLIZKOST_GROUP)$(O) \ - src/pmc/bkmarshal$(O) \ - $(PMC_SOURCES:.pmc=@o@) - -CLEANUPS = \ - "src/pmc/*$(LOAD_EXT)" \ - "src/pmc/*$(O)" \ - "src/pmc/p5*.c" \ - "src/pmc/pmc*.h" \ - "src/pmc/*.dump" \ -#IF(win32): "src/pmc/*.exp" \ -#IF(win32): "src/pmc/*.ilk" \ -#IF(win32): "src/pmc/*.manifext" \ -#IF(win32): "src/pmc/*.pdb" \ -#IF(win32): "src/pmc/*.lib" \ - $(STAGING_DIR)/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) - -pmc_all: pmc_staging - -src/pmc/init_with_xs.h: - $(PERL) -MExtUtils::Embed -e xsinit -- -o src/pmc/init_with_xs.h - -.SUFFIXES : .pmc .dump - -.pmc.dump: - $(PMC2C) --no-lines --dump $(PMC2C_INCLUDES) $< -.pmc.c: - $(PMC2C) --no-lines -c $(PMC2C_INCLUDES) $< - -pmc_generate: src/pmc/init_with_xs.h $(PMC_SOURCES) $(PMC_DUMP) $(PMC_C) - $(PMC2C) --no-lines --library $(PMC_BLIZKOST_GROUP) -c $(PMC_SOURCES) - -pmc_compile: pmc_generate - $(CC) $(CC_OUT)src/pmc/p5sv$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5sv.c - $(CC) $(CC_OUT)src/pmc/p5scalar$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5scalar.c - $(CC) $(CC_OUT)src/pmc/p5namespace$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5namespace.c - $(CC) $(CC_OUT)src/pmc/p5interpreter$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5interpreter.c - $(CC) $(CC_OUT)src/pmc/p5invocation$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5invocation.c - $(CC) $(CC_OUT)src/pmc/p5hashiter$(O) $(INCLUDES) $(CFLAGS) src/pmc/p5hashiter.c - $(CC) $(CC_OUT)src/pmc/lib-$(PMC_BLIZKOST_GROUP)$(O) $(INCLUDES) $(CFLAGS) src/pmc/$(PMC_BLIZKOST_GROUP).c - $(CC) $(CC_OUT)src/pmc/bkmarshal$(O) $(INCLUDES) $(CFLAGS) src/pmc/bkmarshal.c - -pmc_linklibs: pmc_compile - $(LD) $(LD_OUT)src/pmc/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) $(OBJS) $(LINKARGS) - -pmc_staging: pmc_linklibs -#IF(cygwin): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" -#IF(hpux): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" - $(CP) "src/pmc/*$(LOAD_EXT)" $(STAGING_DIR) - -pmc_install: -#IF(cygwin): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" -#IF(hpux): CHMOD 0775 "src/pmc/*$(LOAD_EXT)" - $(MKPATH) $(INSTALL_DIR) - $(CP) "src/pmc/*$(LOAD_EXT)" $(INSTALL_DIR) - -pmc_uninstall: - $(RM_F) $(INSTALL_DIR)/$(PMC_BLIZKOST_GROUP)$(LOAD_EXT) - -src/pmc/Makefile: build/src/pmc/Makefile.in - $(PERL) Configure.pl - -pmc_clean: - $(RM_F) $(CLEANUPS) - -pmc_realclean: - $(RM_F) $(CLEANUPS) src/pmc/Makefile - -# Local variables: -# mode: makefile -# End: -# vim: ft=make: -