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.35 by gbeauche, 2005-07-03T13:05:36Z vs.
Revision 1.44 by asvitkine, 2008-11-21T01:09:28Z

# 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 40 | Line 42 | SLIRP_CFLAGS = @SLIRP_CFLAGS@
42   SLIRP_SRCS = @SLIRP_SRCS@
43   SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o)
44  
45 + STANDALONE_GUI = @STANDALONE_GUI@
46 + GUI_CFLAGS = @GUI_CFLAGS@
47 + GUI_LIBS = @GUI_LIBS@
48 + GUI_SRCS = ../prefs.cpp prefs_unix.cpp prefs_editor_gtk.cpp ../prefs_items.cpp \
49 +        ../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp
50 +
51   # Append disassembler to dyngen, if available
52   ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
53   DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
# Line 53 | Line 61 | SRCS = ../main.cpp main_unix.cpp ../pref
61      ../gfxaccel.cpp ../video.cpp video_blit.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
62      ../serial.cpp ../extfs.cpp \
63      about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
64 <    vm_alloc.cpp sigsegv.cpp \
64 >    vm_alloc.cpp sigsegv.cpp rpc_unix.cpp \
65      sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
66   APP = SheepShaver
67   APP_EXE = $(APP)$(EXEEXT)
68   APP_APP = $(APP).app
69  
70 + PROGS = $(APP_EXE)
71 + ifeq ($(STANDALONE_GUI),yes)
72 + GUI_APP = SheepShaverGUI
73 + GUI_APP_EXE = $(GUI_APP)$(EXEEXT)
74 + GUI_APP_APP = $(GUI_APP).app
75 + PROGS += $(GUI_APP_EXE)
76 + else
77 + CXXFLAGS += $(GUI_CFLAGS)
78 + LIBS += $(GUI_LIBS)
79 + endif
80 +
81   ## Rules
82   .PHONY: modules install uninstall clean distclean depend dep
83   .SUFFIXES:
84   .SUFFIXES: .c .cpp .S .o .h
85  
86 < all: $(APP_EXE)
86 > all: $(PROGS)
87  
88   OBJ_DIR = obj
89   $(OBJ_DIR)::
# Line 76 | Line 95 | define SRCS_LIST_TO_OBJS
95   endef
96   OBJS = $(SRCS_LIST_TO_OBJS)
97  
98 + define GUI_SRCS_LIST_TO_OBJS
99 +        $(addprefix $(OBJ_DIR)/, $(addsuffix .go, $(foreach file, $(GUI_SRCS), \
100 +        $(basename $(notdir $(file))))))
101 + endef
102 + GUI_OBJS = $(GUI_SRCS_LIST_TO_OBJS)
103 +
104   define DYNGENSRCS_LIST_TO_OBJS
105 <        $(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(DYNGENSRCS), \
105 >        $(addprefix $(OBJ_DIR)/, $(addsuffix .dgo, $(foreach file, $(DYNGENSRCS), \
106          $(basename $(notdir $(file))))))
107   endef
108   DYNGENOBJS = $(DYNGENSRCS_LIST_TO_OBJS)
# Line 87 | Line 112 | VPATH :=
112   VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS))))
113  
114   $(APP_EXE): $(OBJ_DIR) $(OBJS)
115 <        $(CXX) -o $(APP_EXE) $(LDFLAGS) $(OBJS) $(LIBS)
115 >        $(CXX) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
116          $(BLESS) $(APP_EXE)
117  
118 < $(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/SheepShaver.icns
118 > $(GUI_APP_EXE): $(OBJ_DIR) $(GUI_OBJS)
119 >        $(CXX) -o $@ $(LDFLAGS) $(GUI_OBJS) $(GUI_LIBS)
120 >
121 > $(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
122          mkdir -p $(APP_APP)/Contents
123          cp -f ../MacOSX/Info.plist $(APP_APP)/Contents/
124          echo -n 'APPL????' > $(APP_APP)/Contents/PkgInfo
125          mkdir -p $(APP_APP)/Contents/MacOS
126          cp -f $(APP) $(APP_APP)/Contents/MacOS/
127 <        strip $(APP_APP)/Contents/MacOS/$(APP)
127 >        strip -x $(APP_APP)/Contents/MacOS/$(APP)
128          mkdir -p $(APP_APP)/Contents/Resources
129 +        cp -R ../MacOSX/PrefsEditor/standalone_nib/English.lproj $(APP_APP)/Contents/Resources
130          cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
131  
132 + $(GUI_APP)_app: $(GUI_APP) ../MacOSX/Info.plist ../MacOSX/$(APP).icns
133 +        mkdir -p $(GUI_APP_APP)/Contents
134 +        sed -e "s/$(APP)/$(GUI_APP)/" < ../MacOSX/Info.plist > $(GUI_APP_APP)/Contents/Info.plist
135 +        echo -n 'APPL????' > $(GUI_APP_APP)/Contents/PkgInfo
136 +        mkdir -p $(GUI_APP_APP)/Contents/MacOS
137 +        cp -f $(GUI_APP) $(GUI_APP_APP)/Contents/MacOS/
138 +        strip -x $(GUI_APP_APP)/Contents/MacOS/$(GUI_APP)
139 +        mkdir -p $(GUI_APP_APP)/Contents/Resources
140 +        cp -f ../MacOSX/$(APP).icns $(GUI_APP_APP)/Contents/Resources/$(GUI_APP).icns
141 +
142   modules:
143          cd Linux/NetDriver; make
144  
145 < install: $(APP_EXE) installdirs
145 > install: $(PROGS) installdirs
146          $(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
147 +        if test -f "$(GUI_APP_EXE)"; then \
148 +          $(INSTALL_PROGRAM) $(GUI_APP_EXE) $(DESTDIR)$(bindir)/$(GUI_APP_EXE); \
149 +        fi
150          -$(INSTALL_DATA) $(APP).1 $(DESTDIR)$(man1dir)/$(APP).1
151          $(INSTALL_DATA) $(KEYCODES) $(DESTDIR)$(datadir)/$(APP)/keycodes
152          $(INSTALL_DATA) tunconfig $(DESTDIR)$(datadir)/$(APP)/tunconfig
# Line 115 | Line 157 | installdirs:
157  
158   uninstall:
159          rm -f $(DESTDIR)$(bindir)/$(APP_EXE)
160 +        rm -f $(DESTDIR)$(bindir)/$(GUI_APP_EXE)
161          rm -f $(DESTDIR)$(man1dir)/$(APP).1
162          rm -f $(DESTDIR)$(datadir)/$(APP)/keycodes
163          rm -f $(DESTDIR)$(datadir)/$(APP)/tunconfig
164          rmdir $(DESTDIR)$(datadir)/$(APP)
165  
166   clean:
167 <        rm -f $(APP_EXE) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
167 >        rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
168          rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp ppc_asm.out.s
169 <        rm -rf $(APP_APP)
169 >        rm -rf $(APP_APP) $(GUI_APP_APP)
170  
171   distclean: clean
172          rm -rf $(OBJ_DIR)
# Line 146 | Line 189 | $(OBJ_DIR)/%.o : %.S
189          $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
190          $(AS) $(ASFLAGS) -o $@ $*.out.s
191          rm $*.out.s
192 + $(OBJ_DIR)/%.go : %.cpp
193 +        $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(GUI_CFLAGS) -DSTANDALONE_GUI -c $< -o $@
194  
195   # Kheperix CPU emulator
196   kpxsrcdir = ../kpx_cpu/src
# Line 155 | Line 200 | DYNGEN    = dyngen$(EXEEXT)
200   ifeq ($(USE_DYNGEN),yes)
201   DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
202  
203 + # Only GCC is supported for generating synthetic opcodes
204   $(DYNGEN): $(DYNGENOBJS)
205 <        $(CXX) -o $@ $(LDFLAGS) $(DYNGENOBJS)
205 >        $(DYNGEN_CC) -o $@ $(LDFLAGS) $(DYNGENOBJS)
206 >
207 > $(OBJ_DIR)/%.dgo : %.c
208 >        $(DYNGEN_CC) -xc $(CPPFLAGS) $(DEFS) $(DYNGEN_CFLAGS) -c $< -o $@
209 > $(OBJ_DIR)/%.dgo : %.cpp
210 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) -c $< -o $@
211  
212   $(OBJ_DIR)/basic-dyngen.o: basic-dyngen-ops.hpp
213   $(OBJ_DIR)/basic-dyngen-ops.o: $(kpxsrcdir)/cpu/jit/basic-dyngen-ops.cpp
214 <        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
214 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
215   basic-dyngen-ops.hpp: $(OBJ_DIR)/basic-dyngen-ops.o $(DYNGEN)
216          ./$(DYNGEN) -o $@ $<
217  
218   $(OBJ_DIR)/ppc-dyngen.o: ppc-dyngen-ops.hpp
219   $(OBJ_DIR)/ppc-dyngen-ops.o: $(kpxsrcdir)/cpu/ppc/ppc-dyngen-ops.cpp basic-dyngen-ops.hpp
220 <        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
220 >        $(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(DYNGEN_CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
221   ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
222          ./$(DYNGEN) -o $@ $<
223  
224 < $(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
224 > $(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o $(OBJ_DIR)/ppc-jit.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
225   endif
226  
227   $(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
# Line 178 | Line 229 | ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/p
229          $(CPP) $(CPPFLAGS) -DGENEXEC $< | $(PERL) $(GENEXECPL) > $@
230  
231   # PowerPC CPU tester
232 < 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
232 > 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 utils/utils-cpuinfo.cpp
233   ifeq ($(USE_DYNGEN),yes)
234 < TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
234 > TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp cpu/ppc/ppc-jit.cpp
235   endif
236   TESTSRCS  = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)
237  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines