ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/Makefile.in
(Generate patch)

Comparing SheepShaver/src/Unix/Makefile.in (file contents):
Revision 1.30 by gbeauche, 2005-02-21T22:29:49Z vs.
Revision 1.37 by gbeauche, 2005-12-11T18:15:34Z

# Line 17 | Line 17 | CC = @CC@
17   CXX = @CXX@
18   CFLAGS = @CFLAGS@
19   CXXFLAGS = @CXXFLAGS@
20 < CPPFLAGS = @CPPFLAGS@ -I../include -I.
20 > CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../slirp
21   DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
22   LDFLAGS = @LDFLAGS@
23   LIBS = @LIBS@
# Line 28 | Line 28 | PERL = @PERL@
28   USE_DYNGEN = @USE_DYNGEN@
29   DYNGENSRCS = @DYNGENSRCS@
30   DYNGEN_CC = @DYNGEN_CC@
31 + DYNGEN_CFLAGS = @DYNGEN_CFLAGS@
32 + DYNGEN_CXXFLAGS = @DYNGEN_CXXFLAGS@
33   DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
34   BLESS = @BLESS@
35   EXEEXT = @EXEEXT@
# Line 36 | Line 38 | INSTALL = @INSTALL@
38   INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
39   INSTALL_DATA = @INSTALL_DATA@
40  
41 + SLIRP_CFLAGS = @SLIRP_CFLAGS@
42 + SLIRP_SRCS = @SLIRP_SRCS@
43 + SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o)
44 +
45   # Append disassembler to dyngen, if available
46   ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
47   DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
# Line 50 | Line 56 | SRCS = ../main.cpp main_unix.cpp ../pref
56      ../serial.cpp ../extfs.cpp \
57      about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
58      vm_alloc.cpp sigsegv.cpp \
59 <    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS)
59 >    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
60   APP = SheepShaver
61   APP_EXE = $(APP)$(EXEEXT)
62   APP_APP = $(APP).app
# Line 73 | Line 79 | endef
79   OBJS = $(SRCS_LIST_TO_OBJS)
80  
81   define DYNGENSRCS_LIST_TO_OBJS
82 <        $(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(DYNGENSRCS), \
82 >        $(addprefix $(OBJ_DIR)/, $(addsuffix .dgo, $(foreach file, $(DYNGENSRCS), \
83          $(basename $(notdir $(file))))))
84   endef
85   DYNGENOBJS = $(DYNGENSRCS_LIST_TO_OBJS)
# Line 97 | Line 103 | $(APP)_app: $(APP) ../MacOSX/Info.plist
103          cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
104  
105   modules:
106 <        cd NetDriver; make
106 >        cd Linux/NetDriver; make
107  
108   install: $(APP_EXE) installdirs
109          $(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
# Line 118 | Line 124 | uninstall:
124  
125   clean:
126          rm -f $(APP_EXE) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
127 <        rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
127 >        rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp ppc_asm.out.s
128          rm -rf $(APP_APP)
129  
130   distclean: clean
# Line 130 | Line 136 | distclean: clean
136   depend dep:
137          makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
138  
139 + $(OBJ_DIR)/%.o : ../slirp/%.c
140 +        $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@
141   $(OBJ_DIR)/%.o : %.c
142          $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
143   $(OBJ_DIR)/%.o : %.cpp
# Line 149 | Line 157 | DYNGEN    = dyngen$(EXEEXT)
157   ifeq ($(USE_DYNGEN),yes)
158   DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
159  
160 + # Only GCC is supported for generating synthetic opcodes
161   $(DYNGEN): $(DYNGENOBJS)
162 <        $(CXX) -o $@ $(LDFLAGS) $(DYNGENOBJS)
162 >        $(DYNGEN_CC) -o $@ $(LDFLAGS) $(DYNGENOBJS)
163 >
164 > $(OBJ_DIR)/%.dgo : %.c
165 >        $(DYNGEN_CC) -xc $(CPPFLAGS) $(DEFS) $(DYNGEN_CFLAGS) -c $< -o $@
166 > $(OBJ_DIR)/%.dgo : %.cpp
167 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) -c $< -o $@
168  
169   $(OBJ_DIR)/basic-dyngen.o: basic-dyngen-ops.hpp
170   $(OBJ_DIR)/basic-dyngen-ops.o: $(kpxsrcdir)/cpu/jit/basic-dyngen-ops.cpp
171 <        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
171 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
172   basic-dyngen-ops.hpp: $(OBJ_DIR)/basic-dyngen-ops.o $(DYNGEN)
173          ./$(DYNGEN) -o $@ $<
174  
175   $(OBJ_DIR)/ppc-dyngen.o: ppc-dyngen-ops.hpp
176   $(OBJ_DIR)/ppc-dyngen-ops.o: $(kpxsrcdir)/cpu/ppc/ppc-dyngen-ops.cpp basic-dyngen-ops.hpp
177 <        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
177 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
178   ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
179          ./$(DYNGEN) -o $@ $<
180  
# Line 172 | Line 186 | ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/p
186          $(CPP) $(CPPFLAGS) -DGENEXEC $< | $(PERL) $(GENEXECPL) > $@
187  
188   # PowerPC CPU tester
189 < TESTSRCS_ = mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
189 > TESTSRCS_ = mathlib/ieeefp.cpp mathlib/mathlib.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
190   ifeq ($(USE_DYNGEN),yes)
191   TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
192   endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines