]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blame - src/patches/icecream-rename-scheduler.patch
Merge branch 'ppp-update' into beyond-next
[people/teissler/ipfire-2.x.git] / src / patches / icecream-rename-scheduler.patch
CommitLineData
8b316677
MT
1Index: icecc-0.9.6/doc/man-scheduler.1.docbook
2===================================================================
3--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook
4+++ icecc-0.9.6/doc/man-scheduler.1.docbook
5@@ -23,13 +23,13 @@
6 </refmeta>
7
8 <refnamediv>
9- <refname>scheduler</refname>
10+ <refname>icecc-scheduler</refname>
11 <refpurpose>Icecream scheduler</refpurpose>
12 </refnamediv>
13
14 <refsynopsisdiv>
15 <cmdsynopsis>
16-<command>scheduler</command>
17+<command>icecc-scheduler</command>
18 <group>
19 <arg choice="opt">
20 <option>-n</option>
21@@ -151,7 +151,7 @@ need to run the scheduler with root righ
22
23 <refsect1>
24 <title>See Also</title>
25-<para>icecream, scheduler, iceccd, icemon</para>
26+<para>icecream, icecc-scheduler, iceccd, icemon</para>
27 </refsect1>
28
29 <refsect1>
30Index: icecc-0.9.6/services/Makefile.am
31===================================================================
32--- icecc-0.9.6.orig/services/Makefile.am
33+++ icecc-0.9.6/services/Makefile.am
34@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h
35 noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
36 icedir = $(includedir)/icecc
37
38-sbin_PROGRAMS = scheduler
39-scheduler_SOURCES = scheduler.cpp
40-scheduler_LDADD = libicecc.la
41+sbin_PROGRAMS = icecc-scheduler
42+icecc_scheduler_SOURCES = scheduler.cpp
43+icecc_scheduler_LDADD = libicecc.la
44
45 pkgconfigdir = $(libdir)/pkgconfig
46 pkgconfig_DATA = icecc.pc
47Index: icecc-0.9.6/services/Makefile.in
48===================================================================
49--- icecc-0.9.6.orig/services/Makefile.in
50+++ icecc-0.9.6/services/Makefile.in
51@@ -37,7 +37,7 @@ PRE_UNINSTALL = :
52 POST_UNINSTALL = :
53 build_triplet = @build@
54 host_triplet = @host@
55-sbin_PROGRAMS = scheduler$(EXEEXT)
56+sbin_PROGRAMS = icecc-scheduler$(EXEEXT)
57 subdir = services
58 DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \
59 $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in
60@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX
61 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \
62 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
63 PROGRAMS = $(sbin_PROGRAMS)
64-am_scheduler_OBJECTS = scheduler.$(OBJEXT)
65-scheduler_OBJECTS = $(am_scheduler_OBJECTS)
66-scheduler_DEPENDENCIES = libicecc.la
67+am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT)
68+icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS)
69+icecc_scheduler_DEPENDENCIES = libicecc.la
70 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
71 depcomp = $(SHELL) $(top_srcdir)/depcomp
72 am__depfiles_maybe = depfiles
73@@ -107,8 +107,8 @@ CXXLD = $(CXX)
74 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
75 --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
76 $(LDFLAGS) -o $@
77-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
78-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES)
79+SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
80+DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES)
81 DATA = $(pkgconfig_DATA)
82 HEADERS = $(ice_HEADERS) $(noinst_HEADERS)
83 ETAGS = etags
84@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC
85 ice_HEADERS = job.h comm.h
86 noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h
87 icedir = $(includedir)/icecc
88-scheduler_SOURCES = scheduler.cpp
89-scheduler_LDADD = libicecc.la
90+icecc_scheduler_SOURCES = scheduler.cpp
91+icecc_scheduler_LDADD = libicecc.la
92 pkgconfigdir = $(libdir)/pkgconfig
93 pkgconfig_DATA = icecc.pc
94 all: all-am
95@@ -358,9 +358,9 @@ clean-sbinPROGRAMS:
96 list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
97 echo " rm -f" $$list; \
98 rm -f $$list
99-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES)
100- @rm -f scheduler$(EXEEXT)
101- $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS)
102+icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES)
103+ @rm -f icecc-scheduler$(EXEEXT)
104+ $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS)
105
106 mostlyclean-compile:
107 -rm -f *.$(OBJEXT)