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.29 by gbeauche, 2005-02-13T15:32:10Z vs.
Revision 1.35 by gbeauche, 2005-07-03T13:05:36Z

# 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 36 | Line 36 | INSTALL = @INSTALL@
36   INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
37   INSTALL_DATA = @INSTALL_DATA@
38  
39 + SLIRP_CFLAGS = @SLIRP_CFLAGS@
40 + SLIRP_SRCS = @SLIRP_SRCS@
41 + SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o)
42 +
43   # Append disassembler to dyngen, if available
44   ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
45   DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
# Line 50 | Line 54 | SRCS = ../main.cpp main_unix.cpp ../pref
54      ../serial.cpp ../extfs.cpp \
55      about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
56      vm_alloc.cpp sigsegv.cpp \
57 <    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS)
57 >    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
58   APP = SheepShaver
59   APP_EXE = $(APP)$(EXEEXT)
60   APP_APP = $(APP).app
# Line 97 | Line 101 | $(APP)_app: $(APP) ../MacOSX/Info.plist
101          cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
102  
103   modules:
104 <        cd NetDriver; make
104 >        cd Linux/NetDriver; make
105  
106   install: $(APP_EXE) installdirs
107          $(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
# Line 118 | Line 122 | uninstall:
122  
123   clean:
124          rm -f $(APP_EXE) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
125 <        rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
125 >        rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp ppc_asm.out.s
126          rm -rf $(APP_APP)
127  
128   distclean: clean
# Line 130 | Line 134 | distclean: clean
134   depend dep:
135          makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
136  
137 + $(OBJ_DIR)/%.o : ../slirp/%.c
138 +        $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(SLIRP_CFLAGS) -c $< -o $@
139   $(OBJ_DIR)/%.o : %.c
140          $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
141   $(OBJ_DIR)/%.o : %.cpp
# Line 137 | Line 143 | $(OBJ_DIR)/%.o : %.cpp
143   $(OBJ_DIR)/%.o : %.mm
144          $(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
145   $(OBJ_DIR)/%.o : %.S
146 <        $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.s
147 <        $(AS) $(ASFLAGS) -o $@ $*.s
148 <        rm $*.s
146 >        $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
147 >        $(AS) $(ASFLAGS) -o $@ $*.out.s
148 >        rm $*.out.s
149  
150   # Kheperix CPU emulator
151   kpxsrcdir = ../kpx_cpu/src

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines