From a80f902fdbc38c64e99303d2567c9d02464db496 Mon Sep 17 00:00:00 2001 From: Ian MacArthur Date: Sat, 19 Mar 2016 21:55:10 +0000 Subject: Fix typo that was preventing the porting branch form building on OSX with a Makefile build. Note that the dependencies in the Makefile build are somewhat out-of-synch in the porting branch right now as things transition... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11383 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index af93cd432..60b7a53a4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -251,8 +251,8 @@ XLIBCPPFILES = \ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx \ drivers/X11/Fl_X11_Window_Driver.cxx \ drivers/X11/Fl_X11_Screen_Driver.cxx \ - drivers/Posix/Fl_Posix_System_Driver.cxx - drivers/Posix/Fl_Posix_Printer_Driver.cxx + drivers/Posix/Fl_Posix_System_Driver.cxx \ + drivers/Posix/Fl_Posix_Printer_Driver.cxx XLIBFONTFILES = \ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.cxx @@ -303,7 +303,7 @@ IMGOBJECTS = $(IMGCPPFILES:.cxx=.o) all: $(LIBNAME) $(DSONAME) \ $(FLLIBNAME) $(FLDSONAME) \ $(GLLIBNAME) $(GLDSONAME) \ - $(IMGLIBNAME) $(IMGDSONAME) + $(IMGLIBNAME) $(IMGDSONAME) $(LIBNAME): $(OBJECTS) echo $(LIBCOMMAND) $@ ... @@ -578,10 +578,10 @@ Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_WIN32.cxx Fl_Native_File_Chooser_MAC.o: Fl_Native_File_Chooser_MAC.mm Fl.o: Fl_win32.cxx Fl_cocoa.o: Fl_cocoa.mm -fl_color.o: +fl_color.o: fl_dnd.o: fl_dnd_win32.cxx fl_dnd_x.cxx fl_read_image.o: fl_read_image_mac.cxx fl_read_image_win32.cxx -Fl_Printer.o: Fl_GDI_Printer.cxx ../src/drivers/PostScript/Fl_PostScript.cxx +Fl_Printer.o: ../src/drivers/PostScript/Fl_PostScript.cxx Fl_Quartz_Printer.o: Fl_Quartz_Printer.mm fl_arci.o: ../FL/mac.H ../FL/win32.H Fl_arg.o: ../FL/mac.H ../FL/win32.H @@ -634,7 +634,7 @@ gl_start.o: ../FL/mac.H ../FL/win32.H install: $(LIBNAME) $(DSONAME) \ $(FLLIBNAME) $(FLDSONAME) \ $(GLLIBNAME) $(GLDSONAME) \ - $(IMGLIBNAME) $(IMGDSONAME) + $(IMGLIBNAME) $(IMGDSONAME) echo "Installing libraries in $(DESTDIR)$(libdir)..." -$(INSTALL_DIR) $(DESTDIR)$(libdir) -$(INSTALL_DIR) $(DESTDIR)$(bindir) -- cgit v1.2.3