Skip to content

Commit 6dd63f3

Browse files
committed
Stop installing to libexec.
1 parent 9a090b3 commit 6dd63f3

1 file changed

Lines changed: 9 additions & 26 deletions

File tree

tools/Makefile

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# IPP tools makefile for libcups.
33
#
4-
# Copyright © 2021-2022 by OpenPrinting.
4+
# Copyright © 2021-2023 by OpenPrinting.
55
# Copyright © 2007-2019 by Apple Inc.
66
# Copyright © 1997-2006 by Easy Software Products, all rights reserved.
77
#
@@ -18,18 +18,13 @@ OBJS = \
1818
ippeveps.o \
1919
ippfind.o \
2020
ipptool.o
21-
IPPEVECOMMANDS = \
22-
ippevepcl \
23-
ippeveps
2421
IPPTOOLS = \
22+
ippevepcl \
2523
ippeveprinter \
26-
ippeveprinter-static \
24+
ippeveps \
2725
ippfind \
28-
ippfind-static \
29-
ipptool \
30-
ipptool-static
26+
ipptool
3127
TARGETS = \
32-
$(IPPEVECOMMANDS) \
3328
$(IPPTOOLS) \
3429
$(LOCALTARGET)
3530

@@ -60,7 +55,7 @@ unittests:
6055
#
6156

6257
clean:
63-
$(RM) $(IPPTOOLS) $(IPPEVECOMMANDS) $(OBJS)
58+
$(RM) $(IPPTOOLS) $(OBJS)
6459
$(RM) test.log test-cups.log
6560

6661

@@ -82,16 +77,10 @@ install: all
8277
for file in $(IPPTOOLS); do \
8378
$(INSTALL_BIN) $$file $(BUILDROOT)$(bindir); \
8479
done
85-
echo "Installing printer commands to $(BUILDROOT)$(libexecdir)/command..."
86-
$(INSTALL_DIR) $(BUILDROOT)$(libexecdir)/command
87-
for file in $(IPPEVECOMMANDS); do \
88-
$(INSTALL_BIN) $$file $(BUILDROOT)$(bindir); \
89-
$(LN) $(bindir)/$$file $(BUILDROOT)$(libexecdir)/ippeveprinter; \
90-
done
9180
if test "x$(SYMROOT)" != "x"; then \
9281
echo "Copying debug symbols to $(SYMROOT)..."; \
9382
$(INSTALL_DIR) $(SYMROOT); \
94-
for file in $(IPPTOOLS) $(IPPEVECOMMANDS); do \
83+
for file in $(IPPTOOLS); do \
9584
cp $$file $(SYMROOT); \
9685
dsymutil $(SYMROOT)/$$file; \
9786
done; \
@@ -108,12 +97,6 @@ uninstall:
10897
$(RM) $(BUILDROOT)$(bindir)/$$file; \
10998
done
11099
-$(RMDIR) $(BUILDROOT)$(bindir)
111-
echo "Uninstalling print commands from $(BUILDROOT)$(libexecdir)/command..."
112-
for file in $(IPPEVECOMMANDS); do \
113-
$(RM) $(BUILDROOT)$(bindir)/$$file; \
114-
$(RM) $(BUILDROOT)$(libexecdir)/command/$$file; \
115-
done
116-
-$(RMDIR) $(BUILDROOT)$(libexecdir)/command
117100

118101

119102
#
@@ -135,7 +118,7 @@ test: local
135118
# ippeveprinter
136119
#
137120

138-
ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS)
121+
ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS) ippeveprinter-static
139122
echo Linking $@...
140123
$(CC) $(LDFLAGS) $(OPTIM) -o $@ ippeveprinter.o $(LINKCUPS) $(LIBS)
141124
$(CODE_SIGN) $(CSFLAGS) $@
@@ -175,7 +158,7 @@ ippeveps: ippeveps.o ../cups/$(LIBCUPS)
175158
# ippfind
176159
#
177160

178-
ippfind: ippfind.o ../cups/$(LIBCUPS)
161+
ippfind: ippfind.o ../cups/$(LIBCUPS) ippfind-static
179162
echo Linking $@...
180163
$(CC) $(LDFLAGS) $(OPTIM) -o $@ ippfind.o $(DNSSDLIBS) $(LINKCUPS) $(LIBS)
181164
$(CODE_SIGN) $(CSFLAGS) $@
@@ -195,7 +178,7 @@ ippfind-static: ippfind.o ../cups/$(LIBCUPS_STATIC)
195178
# ipptool
196179
#
197180

198-
ipptool: ipptool.o ../cups/$(LIBCUPS)
181+
ipptool: ipptool.o ../cups/$(LIBCUPS) ipptool-static
199182
echo Linking $@...
200183
$(CC) $(LDFLAGS) $(OPTIM) -o $@ ipptool.o $(LINKCUPS) $(LIBS)
201184
$(CODE_SIGN) $(CSFLAGS) $@

0 commit comments

Comments
 (0)