Skip to content

Commit

Permalink
(Hopefully the last time...)
Browse files Browse the repository at this point in the history
Configure.pl - Removed '-I./include', added classes/Makefile generation
MANIFEST     - Added classes/Makefile.in
Makefile.in  - Removed old classes/* make stuff
               Added target for classes/Makefile


git-svn-id: https://svn.parrot.org/parrot/trunk@468 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information
Jeff Goff committed Dec 2, 2001
1 parent 6e1c03c commit 133486e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
5 changes: 3 additions & 2 deletions Configure.pl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ END

cc => $Config{cc},
#ADD C COMPILER FLAGS HERE
ccflags => $Config{ccflags}." -I./include",
ccflags => $Config{ccflags},
libs => $Config{libs},
cc_debug => '-g',
o => '.o', # object files extension
Expand Down Expand Up @@ -202,6 +202,7 @@ END
buildfile("config_h", "include/parrot");
# and the makefile
buildfile("Makefile");
buildfile("classes/Makefile");
# and Parrot::Config
buildconfigpm();
# and the types file
Expand Down Expand Up @@ -344,7 +345,7 @@ sub compiletestc {
my $name;
$name = shift;
$name = "test" unless $name;
system("$c{cc} $c{ccflags} -o test_siz$c{exe} $name.c") and die "C compiler died!";
system("$c{cc} $c{ccflags} -I./include -o test_siz$c{exe} $name.c") and die "C compiler died!";
}

sub runtestc {
Expand Down
1 change: 1 addition & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ChangeLog
chartype.c
chartypes/unicode.c
chartypes/usascii.c
classes/Makefile.in
classes/genclass.pl
classes/pmc2c.pl
classes/perlint.pmc
Expand Down
24 changes: 6 additions & 18 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ platform$(O) classes/perlint$(O) classes/perlstring$(O) classes/perlnum$(O)
#DO NOT ADD C COMPILER FLAGS HERE
#Add them in Configure.pl--look for the
#comment 'ADD C COMPILER FLAGS HERE'
CFLAGS = ${ccflags} ${cc_debug}
CFLAGS = ${ccflags} ${cc_debug} -I./include

C_LIBS = ${libs}

Expand Down Expand Up @@ -88,21 +88,6 @@ encoding/utf16$(O): $(H_FILES)

encoding/utf32$(O): $(H_FILES)

classes/perlint.c: classes/perlint.pmc
$(PERL) classes/pmc2c.pl classes/perlint.pmc

classes/perlint$(O): $(H_FILES)

classes/perlnum.c: classes/perlnum.pmc
$(PERL) classes/pmc2c.pl classes/perlnum.pmc

classes/perlnum$(O): $(H_FILES)

classes/perlstring.c: classes/perlstring.pmc
$(PERL) classes/pmc2c.pl classes/perlstring.pmc

classes/perlstring$(O): $(H_FILES)

interpreter$(O): interpreter.c $(H_FILES)

memory$(O): $(H_FILES)
Expand Down Expand Up @@ -134,9 +119,11 @@ docs: docs/.dummy
docs/.dummy:
cd docs; make

classes/perlint$(O):
cd classes; make

clean:
$(RM_F) *$(O) classes/*$(O) chartypes/*$(O) encodings/*$(O)
$(RM_F) classes/*.c
$(RM_F) *$(O) chartypes/*$(O) encodings/*$(O)
$(RM_F) *.s core_ops.c $(TEST_PROG) $(PDISASM) $(PDUMP)
$(RM_F) $(INC)/vtable.h
$(RM_F) $(INC)/oplib/core_ops.h
Expand All @@ -147,6 +134,7 @@ clean:
$(RM_F) examples/assembly/mops$(O) examples/assembly/mops.pbc
$(RM_F) Parrot/OpLib/core.pm
cd docs; make clean
cd classes; make clean

distclean:
perl -MExtUtils::Manifest=filecheck -le '$$ExtUtils::Manifest::Quiet=1;unlink $$_ for filecheck()'
Expand Down

0 comments on commit 133486e

Please sign in to comment.