a new Makefile entry, so a Distribution is possible!

[r62]

diff --git a/Makefile b/Makefile
index 80fd3f9..1305047 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,15 @@ all:        TAGS ir testprograms
 testprograms:
        $(MAKE) -C testprograms
 
+lib:
+       $(MAKE) -C ir lib
+
 clean:
        for i in $(SUBDIRS); do  $(MAKE) -C $$i clean; done
 
 realclean:
        for i in $(SUBDIRS); do  $(MAKE) -C $$i realclean; done
-       rm -f libfirm.a core
+       rm -f libfirm.a core include/*
 
 TAGFILES = $(shell find . -name '*.c' -o -name '*.h')
 

diff --git a/ir/Makefile b/ir/Makefile
index 67167e4..db6786c 100644 (file)
--- a/ir/Makefile
+++ b/ir/Makefile
@@ -6,8 +6,8 @@
 #
 # Makefile for IR library.
 
-# This makefile descends to all directories listed in INCLUDES and to
-# testprograms and calls make with the corresponding target there.
+# This makefile descends to all directories listed in INCLUDES
+# and calls make with the corresponding target there.
 # After returning it builds a library out of the firm files.
 # Further it updates the TAGS file with each recompilation
 
@@ -40,6 +40,9 @@ debug:
 
 all:   TAGS $(TARGET)
 
+lib:
+       for i in $(SUBDIRS); do  $(MAKE) -C $$i lib; done
+
 clean:
        for i in $(SUBDIRS); do  $(MAKE) -C $$i clean; done
 

diff --git a/ir/adt/Makefile b/ir/adt/Makefile
index 5d6bed7..6a460b2 100644 (file)
--- a/ir/adt/Makefile
+++ b/ir/adt/Makefile
@@ -55,6 +55,8 @@ $(TARGET): $(DFILES) $(OFILES)
        $(COMPILE.c) $(INCLUDES) -DPSET -o $@ $<
 #      $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+
 clean:
        rm -f $(OFILES) $(DFILES)
 

diff --git a/ir/common/Makefile b/ir/common/Makefile
index 5dba7c9..980509e 100644 (file)
--- a/ir/common/Makefile
+++ b/ir/common/Makefile
@@ -22,7 +22,8 @@ X_INCLUDES  =
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = common.m firm.m panic.m
+DISTRIBMEMBERS = common.m firm.m
+MEMBERS         =  $(DISTRIBMEMBERS) panic.m
 
 CFILES = $(MEMBERS:.m=.c)
 CFILES +=  xfprintf.c xfprintf.c xfprintf.c
@@ -30,8 +31,10 @@ CFILES +=  xfprintf.c xfprintf.c xfprintf.c
 HFILES = $(MEMBERS:.m=.h)
 HFILES +=  tune.h xp_help.h xprintf.h misc.h
 HFILES +=  common.h debug.h entity.h gmp.h host.h ident.h irgraph.h \
-          irmode.h irnode.h irop.h irprog.h label.h misc.h obst.h pset.h set.h \
-           tv.h type.h xprintf.h xp_help.h
+          irmode.h irnode.h irop.h irprog.h label.h misc.h obst.h \
+           pset.h set.h tv.h type.h xprintf.h xp_help.h
+
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
 
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 OFILES +=  ../objects/xfprintf.o \
@@ -56,6 +59,9 @@ $(TARGET): $(DFILES) $(OFILES)
 ../objects/%.o:    %.c
        $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+       cp $(DISTRIB) ../../include
+
 clean:
        rm -f $(OFILES) $(DFILES)
 

diff --git a/ir/debug/Makefile b/ir/debug/Makefile
index f71bc14..d868105 100644 (file)
--- a/ir/debug/Makefile
+++ b/ir/debug/Makefile
@@ -23,13 +23,16 @@ AR          = ar rcs
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = debug.m
+DISTRIBMEMBERS =
+MEMBERS         = $(DISTRIBMEMBERS) debug.m
 
 CFILES = $(MEMBERS:.m=.c)
 
 HFILES = $(MEMBERS:.m=.h)
 HFILES +=  misc.h host.h
 
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
+
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 
 DFILES = $(MEMBERS:.m=.d)
@@ -51,6 +54,9 @@ TARGET = all
 
 $(TARGET):      $(DFILES) $(OFILES)
 
+lib:
+       cp $(DISTRIB) ../../include/
+
 clean:
        rm -f $(OFILES) $(DFILES)
 

diff --git a/ir/ident/Makefile b/ir/ident/Makefile
index f097ea9..052130d 100644 (file)
--- a/ir/ident/Makefile
+++ b/ir/ident/Makefile
@@ -21,7 +21,8 @@ X_INCLUDES  =
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = ident.m
+DISTRIBMEMBERS = ident.m
+MEMBERS         = $(DISTRIBMEMBERS)
 
 CFILES = $(MEMBERS:.m=.c)
 
@@ -29,6 +30,8 @@ HFILES = $(MEMBERS:.m=.h)
 HFILES += array.h cookies.h debug.h host.h misc.h set.h tune.h xprintf.h \
          xp_help.h
 
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
+
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 
 DFILES = $(MEMBERS:.m=.d)
@@ -47,6 +50,8 @@ TARGET = all
 ../objects/%.o:    %.c
        $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+       cp $(DISTRIB) ../../include
 
 $(TARGET):      $(DFILES) $(OFILES)
 

diff --git a/ir/ir/Makefile b/ir/ir/Makefile
index 126d07c..3714f4f 100644 (file)
--- a/ir/ir/Makefile
+++ b/ir/ir/Makefile
@@ -22,17 +22,19 @@ X_INCLUDES  =
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = ircons.m irdump.m irflag.m irgmod.m irgraph.m irgopt.m \
+DISTRIBMEMBERS  = ircons.m irdump.m irflag.m irgmod.m irgraph.m irgopt.m \
            irgwalk.m irmode.m irnode.m irop.m iropt.m irprog.m irvrfy.m
+MEMBERS = $(DISTRIBMEMBERS)
 
 CFILES = $(MEMBERS:.m=.c)
 
 HFILES = $(MEMBERS:.m=.h)
-HFILES +=  irnode_t.h
 HFILES +=  array.h common.h cookies.h debug.h entity.h gmp.h  \
            host.h ident.h label.h misc.h obst.h pdeq.h pset.h \
            set.h tune.h tv.h type.h xprintf.h xp_help.h irnode2.h
 
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
+
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 
 DFILES = $(MEMBERS:.m=.d)
@@ -56,6 +58,9 @@ $(TARGET): $(DFILES) $(OFILES)
 ../objects/%.o:        %.c
        $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+       cp $(DISTRIB) ../../include
+
 clean:
        rm -f $(OFILES) $(DFILES)
 

diff --git a/ir/tr/Makefile b/ir/tr/Makefile
index 6f91dd5..492818d 100644 (file)
--- a/ir/tr/Makefile
+++ b/ir/tr/Makefile
@@ -22,7 +22,8 @@ X_INCLUDES  =
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = entity.m mangle.m type.m typewalk.m
+DISTRIBMEMBERS  = entity.m type.m typewalk.m
+MEMBERS         =  $(DISTRIBMEMBERS) mangle.m
 
 CFILES = $(MEMBERS:.m=.c)
 
@@ -32,6 +33,8 @@ HFILES +=  common.h debug.h gmp.h host.h ident.h irgraph.h  \
            irgwalk.h irmode.h irnode.h irop.h label.h misc.h \
            obst.h pset.h set.h tv.h xprintf.h xp_help.h entity_t.h
 
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
+
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 
 DFILES = $(MEMBERS:.m=.d)
@@ -50,6 +53,9 @@ TARGET = all
 ../objects/%.o:    %.c
        $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+       cp $(DISTRIB) ../../include
+
 
 $(TARGET):      $(DFILES) $(OFILES)
 

diff --git a/ir/tv/Makefile b/ir/tv/Makefile
index 4518b37..4e636ba 100644 (file)
--- a/ir/tv/Makefile
+++ b/ir/tv/Makefile
@@ -21,7 +21,8 @@ X_INCLUDES  =
 SHELL       = /bin/sh
 MAKE        = /usr/bin/make
 
-MEMBERS         = tv.m
+DISTRIBMEMBERS  = tv.m
+MEMBERS         =  $(DISTRIBMEMBERS)
 
 CFILES = $(MEMBERS:.m=.c)
 
@@ -31,6 +32,8 @@ HFILES += ieee754.h
 HFILES += common.h debug.h entity.h gmp.h ident.h irmode.h obst.h \
          pset.h tune.h type.h xprintf.h xp_help.h
 
+DISTRIB = $(DISTRIBMEMBERS:.m=.h)
+
 OFILES = $(MEMBERS:%.m=../objects/%.o)
 
 DFILES = $(MEMBERS:.m=.d)
@@ -49,6 +52,8 @@ TARGET = all
 ../objects/%.o:    %.c
        $(CXX) $(CFLAGS) $(CXXFLAGS) $(COPTFLAGS) $(INCLUDES) $(X_INCLUDES) -c $< -o $@
 
+lib:
+       cp $(DISTRIB) ../../include
 
 $(TARGET):      $(DFILES) $(OFILES)
 

diff --git a/testprograms/Makefile b/testprograms/Makefile
index 62cba7c..e306906 100644 (file)
--- a/testprograms/Makefile
+++ b/testprograms/Makefile
@@ -8,6 +8,9 @@ LIBS=-lfirm -lgmp -lm
 %.o:   %.c
        gcc -c $(INCDIRS) -g $<
 
+orb:
+       ls
+
 all: empty const_eval_example                                  \
      if_example if_else_example if_while_example cond_example  \
      call_str_example memory_example array-stack_example       \