projects / packages / libreoffice.git / blame
| Commit | Line | Data |
|---|---|---|
| 27a626b6 PG |
1 | --- oo_1.0_src/tools/bootstrp/addexes/makefile.mk.systemgo Sun Jun 2 19:50:01 2002 |
| 2 | +++ oo_1.0_src/tools/bootstrp/addexes/makefile.mk Sun Jun 2 19:50:11 2002 | |
| 3 | @@ -98,7 +98,6 @@ | |
| 4 | #APP3TARGET= ldump | |
| 5 | APP3STACK= 16000 | |
| 6 | APP3OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj | |
| 7 | -APP3STDLIBS=gnu_getopt.lib | |
| 8 | APP3DEPN= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj | |
| 9 | ||
| 10 | #APP4TARGET= readmap | |
| 27a626b6 PG |
11 | --- oo_1.0_src/tools/bootstrp/cppdep.cxx.systemgo Wed Jun 13 15:43:51 2001 |
| 12 | +++ oo_1.0_src/tools/bootstrp/cppdep.cxx Sun Jun 2 19:29:10 2002 | |
| 13 | @@ -64,18 +64,18 @@ | |
| 14 | ||
| 15 | #ifdef WNT | |
| 16 | #ifdef BOOTSTRAPPER | |
| 17 | -#include <glibc/posix/getopt.h> | |
| 18 | +#include <getopt.h> | |
| 19 | #else | |
| 20 | -#include <glibc/getopt.h> | |
| 21 | +#include <getopt.h> | |
| 22 | #endif | |
| 23 | #endif | |
| 24 | ||
| 25 | #ifdef UNX | |
| 26 | #ifdef MACOSX | |
| 27 | #ifdef BOOTSTRAPPER | |
| 28 | -#include <glibc/posix/getopt.h> | |
| 29 | +#include <getopt.h> | |
| 30 | #else | |
| 31 | -#include <glibc/getopt.h> | |
| 32 | +#include <getopt.h> | |
| 33 | #endif | |
| 34 | #endif | |
| 35 | #include <unistd.h> | |
| 27a626b6 PG |
36 | --- oo_1.0_src/external/glibc/sdfiles/makefile.mk.systemgo Sun Jun 2 19:47:20 2002 |
| 37 | +++ oo_1.0_src/external/glibc/sdfiles/makefile.mk Sun Jun 2 19:48:16 2002 | |
| 38 | @@ -60,6 +60,13 @@ | |
| 39 | # | |
| 40 | #************************************************************************* | |
| 41 | ||
| 42 | +# We use glibc. There's no need to dupe its functionality, especially not | |
| 43 | +# with legacy versions of known good code. | |
| 44 | + | |
| 45 | +all: | |
| 46 | + @echo ignoring gnu_getopt | |
| 47 | + | |
| 48 | + | |
| 49 | PRJ=..$/.. | |
| 50 | ||
| 51 | PRJNAME=3rdparty | |
| 52 | --- oo_1.0_src/external/glibc/makefile.mk.systemgo Tue Nov 21 11:22:34 2000 | |
| 53 | +++ oo_1.0_src/external/glibc/makefile.mk Sun Jun 2 19:29:10 2002 | |
| 54 | @@ -60,6 +60,11 @@ | |
| 55 | # | |
| 56 | #************************************************************************* | |
| 57 | ||
| 58 | +.IF "$(GUI)" == "UNX" | |
| 59 | +all: | |
| 60 | + @echo "Assuming you already have glibc - no need to do anything." | |
| 61 | +.ENDIF | |
| 62 | + | |
| 63 | MAKEFILERC=yes | |
| 64 | ||
| 65 | .IF "$(OS)" == "WNT" | |
| 66 | --- oo_1.0_src/external/prj/d.lst.systemgo Sun Jun 2 19:48:45 2002 | |
| 67 | +++ oo_1.0_src/external/prj/d.lst Sun Jun 2 19:49:02 2002 | |
| be843e99 | 68 | @@ -46,8 +46,6 @@ |
| 69 | ||
| 70 | ..\%__SRC%\slo\np* %_DEST%\lib%_EXT%\* | |
| 71 | ..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\* | |
| 27a626b6 PG |
72 | -..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib |
| 73 | -..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a | |
| 74 | ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib | |
| 75 | ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a | |
| 76 | ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a |