suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bad Makefile merge

Browse Source
This commit is contained in:
Matthew Flatt 2010-07-14 08:48:41 -06:00
parent 4bfed6d797
commit f158effa98
1 changed files with 0 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/gracket/gc2/Makefile.in
View File

@ -79,101 +79,7 @@ wx_mac_LIBS = -framework CoreFoundation
GRACKETLINKER = @MZLINKER@
<<<<<<< HEAD
XOBJS = $(@WXVARIANT@_XOBJS) $(GRACKET_XOBJS)
MZOBJS = ../../racket/libracket3m.@LIBSFX@
wx_xt_PLAIN_OBJS = \
../../wxxt/src/XWidgets/xwArrow.@LTO@ \
../../wxxt/src/XWidgets/xwCommon.@LTO@ \
../../wxxt/src/XWidgets/xwHScrollb.@LTO@ \
../../wxxt/src/XWidgets/xwRowCol.@LTO@ \
../../wxxt/src/XWidgets/xwSlider2.@LTO@ \
../../wxxt/src/XWidgets/xwVScrollb.@LTO@ \
../../wxxt/src/XWidgets/xwBoard.@LTO@ \
../../wxxt/src/XWidgets/xwEnforcer.@LTO@ \
../../wxxt/src/XWidgets/xwLabel.@LTO@ \
../../wxxt/src/XWidgets/xwTabString.@LTO@ \
../../wxxt/src/XWidgets/xwscroll.@LTO@ \
../../wxxt/src/XWidgets/xwButton.@LTO@ \
../../wxxt/src/XWidgets/xwFrame.@LTO@ \
../../wxxt/src/XWidgets/xwMenu.@LTO@ \
../../wxxt/src/XWidgets/xwScrollWin.@LTO@ \
../../wxxt/src/XWidgets/xwToggle.@LTO@ \
../../wxxt/src/XWidgets/xwCanvas.@LTO@ \
../../wxxt/src/XWidgets/xwGroup.@LTO@ \
../../wxxt/src/XWidgets/xwMultiList.@LTO@ \
../../wxxt/src/XWidgets/xwScrollbar.@LTO@ \
../../wxxt/src/XWidgets/xwTools3d.@LTO@
wx_mac_PLAIN_OBJS = \
../../wxmac/src/crbuffri.@LTO@ \
../../wxmac/src/crdatfri.@LTO@ \
../../wxmac/src/create.@LTO@ \
../../wxmac/src/crifrbuf.@LTO@ \
../../wxmac/src/crifrdat.@LTO@ \
../../wxmac/src/data.@LTO@ \
../../wxmac/src/hashtab.@LTO@ \
../../wxmac/src/miscellaneous.@LTO@ \
../../wxmac/src/parse.@LTO@ \
../../wxmac/src/rdftodat.@LTO@ \
../../wxmac/src/rdftoi.@LTO@ \
../../wxmac/src/rgb.@LTO@ \
../../wxmac/src/scan.@LTO@ \
../../wxmac/src/simx.@LTO@ \
../../wxmac/src/wrffrdat.@LTO@ \
../../wxmac/src/wrffri.@LTO@ \
\
../../wxmac/src/ALBirthDeath.@LTO@ \
../../wxmac/src/ALKeyboard.@LTO@ \
../../wxmac/src/ALUserPane.@LTO@ \
../../wxmac/src/LongControls.@LTO@ \
../../wxmac/src/ALCellData.@LTO@ \
../../wxmac/src/ALMouse.@LTO@ \
../../wxmac/src/ALUtilities.@LTO@ \
../../wxmac/src/ALDrawing.@LTO@ \
../../wxmac/src/ALScrolling.@LTO@ \
../../wxmac/src/LongCoords.@LTO@ \
../../wxmac/src/ALEditing.@LTO@ \
../../wxmac/src/ALSelecting.@LTO@ \
../../wxmac/src/QDDrawingState.@LTO@ \
../../wxmac/src/ALHeirarchical.@LTO@ \
../../wxmac/src/ALSelectors.@LTO@
xform: $(XSRCS) xsrc/xcglue.c
wx_font.o : $(srcdir)/../../wxmac/src/mac/wx_font.m
$(CXX) -o wx_font.o -c $(srcdir)/../../wxmac/src/mac/wx_font.m
wx_file_dialog.o : $(srcdir)/../../wxmac/src/mac/wx_file_dialog.m
$(CXX) -o wx_file_dialog.o -c $(srcdir)/../../wxmac/src/mac/wx_file_dialog.m
wx_xt_LIBS = ../../wxxt/contrib/xpm/lib/libXpm.@LTA@ @JPEG_A@ @PNG_A@ @ZLIB_A@
wx_mac_LIBS = -framework Carbon -framework Cocoa -framework QuickTime -framework AGL -framework OpenGL @JPEG_A@ @PNG_A@ -lz @LIBS@
GRACKETLINKER = @GRACKETLINKER@
FOREIGN_OBJS = ../../foreign/libffi/src/*.@LTO@ ../../foreign/libffi/src/*/*.@LTO@
FOREIGN_LIB = ../../foreign/libffi/libffi@FOREIGN_CONVENIENCE@.@LTA@
FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
FOREIGN_USED_LIB = $(FOREIGN_OBJ) $(FOREIGN_LIB)
FOREIGN_USED_OBJSLIB = $(FOREIGN_OBJSLIB)
FOREIGN_NOT_USED_LIB = $(FOREIGN_OBJ)
FOREIGN_NOT_USED_OBJSLIB =
EXTRA_GMP := $(if @EXTRA_GMP_OBJ@,../../racket/src/@EXTRA_GMP_OBJ@,)
EXTRA_MZ_OBJS = ../../racket/src/gmp.@LTO@ $(EXTRA_GMP) ../../racket/src/unwind.@LTO@ $(@FOREIGN_IF_USED@_OBJSLIB)
LIBGRACKETLIBS_a =
LIBGRACKETLIBS_la = $(LDFLAGS) $(LDLIBS) $(@WXVARIANT@_LIBS)
LIBGRACKETMZOBJS_a =
LIBGRACKETMZOBJS_la = $(MZOBJS)
GRACKETLIBS_a = $(LDLIBS) $(@WXVARIANT@_LIBS)
=======
GRACKETLIBS_a = $(LDLIBS)
>>>>>>> C source and build changes to drop wx frm GRacket
GRACKETLIBS_la =
GRACKETMZOBJS_a = $(MZOBJS)
GRACKETMZOBJS_la =