diff options
Diffstat (limited to 'devel/upp/files/patch-uppsrc-ide-Makefile')
| -rw-r--r-- | devel/upp/files/patch-uppsrc-ide-Makefile | 118 |
1 files changed, 11 insertions, 107 deletions
diff --git a/devel/upp/files/patch-uppsrc-ide-Makefile b/devel/upp/files/patch-uppsrc-ide-Makefile index 8a07af10a339..17ca6944eb0b 100644 --- a/devel/upp/files/patch-uppsrc-ide-Makefile +++ b/devel/upp/files/patch-uppsrc-ide-Makefile @@ -1,116 +1,20 @@ ---- uppsrc/ide/Makefile.orig Sat Jun 3 15:34:49 2006 -+++ uppsrc/ide/Makefile Sat Jun 3 15:38:38 2006 -@@ -1,13 +1,13 @@ --UPPDIR1 = /src/uppsrc/ -+UPPDIR1 = ../ +--- uppsrc/ide/Makefile.orig Mon Apr 16 19:28:22 2007 ++++ uppsrc/ide/Makefile Mon Apr 16 19:36:46 2007 +@@ -1,12 +1,11 @@ + UPPDIR1 = uppsrc/ --UPPOUT = /home/cxl/upp/out/ --CINC = -I$(UPPDIR1) + UPPOUT = out/ +-CINC = -I$(UPPDIR1) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagLINUX --CC = c++ -c -O2 -Os -ffunction-sections +-CC = c++ -c -O3 -ffunction-sections -C_FLAGS = $(CC) -x c -CPPFLAGS = $(CC) -x c++ -LIBPATH = -L"/usr/X11R6/lib" -+UPPOUT = $(UPPDIR1)../out/ -+CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 ++CINC = -I$(UPPDIR1) -I$(X11BASE)/include -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/gtk-2.0 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/include/cairo -I$(LOCALBASE)/include/pango-1.0 -I$(LOCALBASE)/include/atk-1.0 +Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagFREEBSD -+C_FLAGS = $(CC) -c $(CFLAGS) -+CPPFLAGS = $(CXX) -c $(CXXFLAGS) ++C_FLAGS = $(CC) -x c -c $(CFLAGS) ++CPPFLAGS = $(CC) -x c++ -c $(CXXFLAGS) +LIBPATH = -L$(X11BASE)/lib -L$(LOCALBASE)/lib AR = ar -sr -+MKDIR?= mkdir -p - OutDir_ide = $(UPPOUT)ide/GCC32-Gcc-Gui-Linux-Main-Shared/ + OutDir_ide = $(UPPOUT)ide/GCC-Gcc-Gui-Linux-Main-Shared/ Macro_ide = $(Macro) -DflagMAIN - OutDir_ide_Common = $(UPPOUT)ide/Common/GCC32-Gcc-Gui-Linux-Shared/ -@@ -76,47 +76,47 @@ - Macro_PdfDraw = $(Macro) - - OutDir = $(OutDir_ide) --OutFile = /home/cxl/ide -+OutFile = $(UPPDIR1)../ide - - .PHONY: all - all: install $(OutFile) - - .PHONY: install - install: -- -mkdir -p $(OutDir) -- -mkdir -p $(OutDir_ide) -- -mkdir -p $(OutDir_ide_Common) -- -mkdir -p $(OutDir_ide_LayDes) -- -mkdir -p $(OutDir_ide_IconDes) -- -mkdir -p $(OutDir_ide_Builders) -- -mkdir -p $(OutDir_ide_Debuggers) -- -mkdir -p $(OutDir_ide_Browser) -- -mkdir -p $(OutDir_ide_Topic) -- -mkdir -p $(OutDir_ide_VectorDes) -- -mkdir -p $(OutDir_CodeEditor) -- -mkdir -p $(OutDir_Topic) -- -mkdir -p $(OutDir_CtrlLib) -- -mkdir -p $(OutDir_Web) -- -mkdir -p $(OutDir_plugin_bz2) -- -mkdir -p $(OutDir_HexView) -- -mkdir -p $(OutDir_Esc) -- -mkdir -p $(OutDir_Core) -- -mkdir -p $(OutDir_RichEdit) -- -mkdir -p $(OutDir_plugin_png) -- -mkdir -p $(OutDir_plugin_gif) -- -mkdir -p $(OutDir_Image) -- -mkdir -p $(OutDir_plugin_tif) -- -mkdir -p $(OutDir_plugin_jpg) -- -mkdir -p $(OutDir_Draw) -- -mkdir -p $(OutDir_plugin_z) -- -mkdir -p $(OutDir_coff_binobj) -- -mkdir -p $(OutDir_coff) -- -mkdir -p $(OutDir_plugin_ndisasm) -- -mkdir -p $(OutDir_CppBase) -- -mkdir -p $(OutDir_VectorDes) -- -mkdir -p $(OutDir_RichText) -- -mkdir -p $(OutDir_CtrlCore) -- -mkdir -p $(OutDir_PdfDraw) -+ -${MKDIR} $(OutDir) -+ -${MKDIR} $(OutDir_ide) -+ -${MKDIR} $(OutDir_ide_Common) -+ -${MKDIR} $(OutDir_ide_LayDes) -+ -${MKDIR} $(OutDir_ide_IconDes) -+ -${MKDIR} $(OutDir_ide_Builders) -+ -${MKDIR} $(OutDir_ide_Debuggers) -+ -${MKDIR} $(OutDir_ide_Browser) -+ -${MKDIR} $(OutDir_ide_Topic) -+ -${MKDIR} $(OutDir_ide_VectorDes) -+ -${MKDIR} $(OutDir_CodeEditor) -+ -${MKDIR} $(OutDir_Topic) -+ -${MKDIR} $(OutDir_CtrlLib) -+ -${MKDIR} $(OutDir_Web) -+ -${MKDIR} $(OutDir_plugin_bz2) -+ -${MKDIR} $(OutDir_HexView) -+ -${MKDIR} $(OutDir_Esc) -+ -${MKDIR} $(OutDir_Core) -+ -${MKDIR} $(OutDir_RichEdit) -+ -${MKDIR} $(OutDir_plugin_png) -+ -${MKDIR} $(OutDir_plugin_gif) -+ -${MKDIR} $(OutDir_Image) -+ -${MKDIR} $(OutDir_plugin_tif) -+ -${MKDIR} $(OutDir_plugin_jpg) -+ -${MKDIR} $(OutDir_Draw) -+ -${MKDIR} $(OutDir_plugin_z) -+ -${MKDIR} $(OutDir_coff_binobj) -+ -${MKDIR} $(OutDir_coff) -+ -${MKDIR} $(OutDir_plugin_ndisasm) -+ -${MKDIR} $(OutDir_CppBase) -+ -${MKDIR} $(OutDir_VectorDes) -+ -${MKDIR} $(OutDir_RichText) -+ -${MKDIR} $(OutDir_CtrlCore) -+ -${MKDIR} $(OutDir_PdfDraw) - - $(OutFile): \ - $(OutDir_ide)SelectPkg.o \ -@@ -182,7 +182,7 @@ - $(OutDir_RichText)RichText.a \ - $(OutDir_CtrlCore)CtrlCore.a \ - $(OutDir_PdfDraw)PdfDraw.a -- c++ -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \ -+ $(CXX) -o $(OutFile) -Wl,-s $(LIBPATH) -Wl,-O,2 $(LINKOPTIONS) \ - $(OutDir_ide)SelectPkg.o \ - $(OutDir_ide)UppWspc.o \ - $(OutDir_ide)UppDlg.o \ |