blob: 3a1be9c1254f8c688d539295770efd7edbf2596e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-aa,v 1.6 2015/05/23 06:43:00 kefren Exp $
--- source/Shell/OdfConverter/Makefile.orig 2008-09-26 21:49:32.000000000 +0300
+++ source/Shell/OdfConverter/Makefile 2015-05-23 09:10:54.000000000 +0300
@@ -54,7 +54,7 @@
$(SOURCE)
main.c bundle.o : OdfConverterTestStatic.exe Makefile
- MONO_PATH='../../Common/OdfZipUtils$(PATHSEP)../../Common/OdfConverterLib$(PATHSEP)../../Word/Converter$(PATHSEP)../../Presentation/Converter$(PATHSEP)../../Spreadsheet/Converter' mkbundle2 -c -o main.c -oo bundle.o --deps $(MACHINE_CONFIG_FILE) OdfConverterTestStatic.exe
+ MONO_PATH='../../Common/OdfZipUtils$(PATHSEP)../../Common/OdfConverterLib$(PATHSEP)../../Word/Converter$(PATHSEP)../../Presentation/Converter$(PATHSEP)../../Spreadsheet/Converter' mkbundle -c -o main.c -oo bundle.o --deps $(MACHINE_CONFIG_FILE) OdfConverterTestStatic.exe
OdfConverter$(EXEEXT) : main.c bundle.o $(ZLIBDEP) Makefile
rm -f $@
@@ -64,16 +64,17 @@
$(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \
`pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \
../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \
- `pkg-config --libs-only-l mono` bundle.o
+ `pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` \
+ `pkg-config --cflags mono-2` bundle.o
else
- $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \
+ $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono-2 gtk+-2.0 gthread-2.0` main.c \
$(KILLAT) \
bundle.o \
$(EXPORTDYNAMIC) \
-Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
- `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \
- -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \
- `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
+ -L../../AdditionalTools/zlib123/contrib/minizip \
+ -Wl,-Bstatic -lmonoboehm-2.0 -lzlibwapi -Wl,-Bdynamic \
+ `pkg-config --libs mono-2 gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono-2.0 //"` \
$(ZLIB) $(OTHERLIBS)
endif
ifeq ($(OS),Cygwin)
|
