Changeset 448


Ignore:
Timestamp:
Jan 31, 2003, 7:39:39 PM (18 years ago)
Author:
pooh
Message:
  • Project tree reorganization, libp++ moved into separate directory.
Location:
to-imperative/trunk
Files:
13 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • to-imperative/trunk/Makefile

    r307 r448  
    1 SUBDIRS = libstdc++-stub compiler runtime library samples
     1SUBDIRS = libstdc++-stub compiler libp++ runtime library samples
    22INSTALL_SUBDIRS = $(SUBDIRS)
    33
  • to-imperative/trunk/config.mk

    r433 r448  
    66CPPFLAGS += -DDEBUG -DPARANOIA
    77CFLAGS += -g
     8CFLAGS += -O3
    89LDLIBS += -static-libgcc -lsupc++
    910INSTALL_DIR = /usr
    10 RFLIB_CFLAGS = -I$(TOPDIR)/runtime
     11RFLIB_CFLAGS = -I$(TOPDIR)/runtime -I$(TOPDIR)/libp++
  • to-imperative/trunk/runtime/Makefile

    r413 r448  
    22
    33include $(TOPDIR)/rules.mk
    4 
    5 PXX_AMODULES = \
    6   pxx_allocator
    7 
    8 PXX_MODULES = \
    9   pxx_common \
    10   pxx_sys_error \
    11   pxx_heap \
    12   pxx_heap_allocator
    134
    145RFRT_MODULES = \
     
    2415  rf_memory_chunk
    2516
    26 PXX_AHEADERS = $(PXX_AMODULES:=.hh)
    27 PXX_SOURCES = $(PXX_MODULES:=.cc)
    28 PXX_HEADERS = $(PXX_MODULES:=.hh)
    29 PXX_IHEADERS = $(PXX_MODULES:=.ih)
    30 PXX_OBJECTS = $(PXX_MODULES:=.o)
    31 
    3217RFRT_SOURCES = $(RFRT_MODULES:=.cc)
    3318RFRT_HEADERS = $(RFRT_MODULES:=.hh)
     
    3520RFRT_OBJECTS = $(RFRT_MODULES:=.o)
    3621
    37 ALL_SOURCES = $(RFRT_SOURCES) $(PXX_SOURCES)
     22ALL_SOURCES = $(RFRT_SOURCES)
    3823
    3924DEPS = $(ALL_SOURCES:.cc=.dep)
     
    4328DISTFILES = Makefile
    4429DISTFILES += $(ALL_SOURCES)
    45 DISTFILES += $(PXX_HEADERS)
    46 DISTFILES += $(PXX_IHEADERS)
    47 DISTFILES += $(PXX_AHEADERS)
    4830DISTFILES += $(RFRT_HEADERS)
    4931
    5032all:: $(LIBRFRT)
    5133
    52 CFLAGS += -O3
     34CPPFLAGS += -I$(TOPDIR)/libp++
    5335
    54 $(LIBRFRT): $(RFRT_OBJECTS) $(PXX_OBJECTS)
     36$(LIBRFRT): $(RFRT_OBJECTS)
    5537        ar cru $@ $^
    5638
  • to-imperative/trunk/samples/Makefile

    r432 r448  
    33include $(TOPDIR)/rules.mk
    44
    5 CPPFLAGS += -I../runtime
     5CPPFLAGS += -I$(TOPDIR)/runtime -I$(TOPDIR)/libp++
    66CPPFLAGS += -DALL_INLINE
    7 CFLAGS += -O3
    87#CFLAGS += -finline-limit=10000 -march=pentium3
    98
     
    2524all:: $(SAMPLES)
    2625
    27 RFPC = ../compiler/rfpc
    28 LIBRFRT = ../runtime/librfrt.a
     26RFPC = $(TOPDIR)/compiler/rfpc
     27LIBRFRT = $(TOPDIR)/runtime/librfrt.a
     28LIBPXX = $(TOPDIR)/libp++/libp++.a
    2929
    3030#$(SAMPLES): $(LIBRFRT)
    3131
    32 LDFLAGS += -L../runtime -L../library -L../libstdc++-stub
    33 LDLIBS += -lrf -lrfrt -lsupc++
     32LDFLAGS += -L$(TOPDIR)/library -L$(TOPDIR)/runtime
     33LDFLAGS += -L$(TOPDIR)/libp++ -L$(TOPDIR)/libstdc++-stub
     34LDLIBS += -lrf -lrfrt -lp++ -lsupc++
    3435
    3536%.cc: %.rf
     
    4041        $(CXX) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(<:.rf=.cc)
    4142
    42 $(SAMPLES): %: %.o $(LIBRFRT)
     43$(SAMPLES): %: %.o $(LIBRFRT) $(LIBPXX)
    4344        $(CXX) -o $@ $< $(LDFLAGS) $(LDLIBS)
    4445       
Note: See TracChangeset for help on using the changeset viewer.