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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
Author: Andreas Beckmann <anbe@debian.org>
Description: do not omit hardening flags
--- a/Imakefile
+++ b/Imakefile
@@ -115,11 +115,18 @@ CleanSubdirs($(SUBDIRS))
# Other targets...
+CFLAGS += $(_CFLAGS)
+
start::
if test `grep -c XAW3DXF Local.xawdefs` = 1 ; then \
cd xaw3dxft ; xmkmf ; make ; cd .. ; fi
@if ! [ -d xaw_incdir ] ; then ./configure ; make ; fi
+all:: pdfconcat
+
+pdfconcat: CPPFLAGS += -DNO_CONFIG=1
+pdfconcat: LDLIBS=
+
install::
mkdir -p $(DESTDIR)$(BINDIR)
cp -f share/bin/imgmerge $(DESTDIR)$(BINDIR)
@@ -143,7 +150,6 @@ install::
mkdir -p $(DESTDIR)$(SHAREDIR)/messages
cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages
chmod -R a+r $(DESTDIR)$(SHAREDIR)/
- sh pdfconcat.c
install -c pdfconcat $(DESTDIR)$(BINDIR)
strip::
@@ -230,8 +236,9 @@ includes:: XPaint.ad.h DefaultRC.txt.h m
if test "$(TOOLFLAGS)" != "" ; \
then ln -s big_tools tools ; else ln -s small_tools tools ; fi
-XPaint.ad: app-defaults
- $(CC) substads.c -o substads
+substads: LDLIBS=
+XPaint.ad: substads
+XPaint.ad: | app-defaults
cd app-defaults ; \
../substads -appdefs \
XPAINT_VERSION $(VERSION) \
@@ -241,13 +248,17 @@ XPaint.ad: app-defaults
XPAINT_EXTERN_VIEWER "$(EXTERN_VIEWER)"
cp -p app-defaults/out/XPaint XPaint.ad
+XPaint.ad.h: substads
XPaint.ad.h: XPaint.ad
- ./substads -ad2c $? $@
+ ./substads -ad2c $< $@
+preproc: LDLIBS=
+messages.h: preproc
messages.h: preproc.c share/messages/Messages
- $(CC) preproc.c -o preproc
./preproc > messages.h
+DefaultRC.txt.h: substads
DefaultRC.txt.h: DefaultRC
- ./substads -ad2c $? $@
+ ./substads -ad2c $< $@
+xpaint.man: substads
xpaint.man: xpaint.man.in .version
./substads -single xpaint.man.in xpaint.man XPAINT_VERSION $(VERSION)
@@ -261,7 +272,7 @@ boxOp.o: xpaint.h misc.h Paint.h ops.h
brushOp.o: xpaint.h misc.h Paint.h palette.h \
graphic.h protocol.h ops.h
circleOp.o: xpaint.h misc.h Paint.h ops.h
-chroma.o: start xpaint.h Paint.h palette.h protocol.h color.h messages.h \
+chroma.o: xpaint.h Paint.h palette.h protocol.h color.h messages.h \
misc.h operation.h ops.h
color.o: messages.h palette.h protocol.h color.h xpaint.h misc.h image.h
colorEdit.o: misc.h palette.h color.h protocol.h
--- a/rw/readScriptC.c
+++ b/rw/readScriptC.c
@@ -76,7 +76,7 @@ ReadScriptC(char *file)
/* compile C script */
sprintf(cmd, "gcc -fPIC -I%s/include -I/usr/include/X11 "
"-c %s -o /tmp/%s.o ; "
- "gcc -fpic -shared -Wl,-soname,%s.so /tmp/%s.o -o /tmp/%s.so\n",
+ "g""c""c -fpic -shared -Wl,-soname,%s.so /tmp/%s.o -o /tmp/%s.so\n",
GetShareDir(),
file, radix, radix, radix, radix);
system(cmd);
|
