Skip to content

Commit 4c1a0de

Browse files
committed
Cleanup: Rename libs
From libuspace-* to liblinuxcnc-uspace-*
1 parent 98b45d6 commit 4c1a0de

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/rtapi/Submakefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,41 @@ endif
5151
USPACE_POSIX_SRCS := rtapi/uspace_posix.cc
5252
USERSRCS += $(USPACE_POSIX_SRCS)
5353
$(call TOOBJSDEPS, $(USPACE_POSIX_SRCS)): EXTRAFLAGS += -pthread -fPIC
54-
../lib/libuspace-posix.so.0: $(call TOOBJS, $(USPACE_POSIX_SRCS))
54+
../lib/liblinuxcnc-uspace-posix.so.0: $(call TOOBJS, $(USPACE_POSIX_SRCS))
5555
$(ECHO) Linking $(notdir $@)
5656
$(Q)$(CXX) -shared $(LDFLAGS) -o $@ $^ -Wl,-soname,$(notdir $@)
57-
TARGETS += ../lib/libuspace-posix.so.0
58-
TARGETS += ../lib/libuspace-posix.so
57+
TARGETS += ../lib/liblinuxcnc-uspace-posix.so.0
58+
TARGETS += ../lib/liblinuxcnc-uspace-posix.so
5959

6060
ifeq ($(CONFIG_USPACE_RTAI),y)
6161
USPACE_RTAI_SRCS := rtapi/uspace_rtai.cc
6262
USERSRCS += $(USPACE_RTAI_SRCS)
6363
$(call TOOBJSDEPS, $(USPACE_RTAI_SRCS)): EXTRAFLAGS += -pthread -fPIC $(filter-out -Wstrict-prototypes,$(RTAI_LXRT_CFLAGS))
64-
../lib/libuspace-rtai.so.0: $(call TOOBJS, $(USPACE_RTAI_SRCS))
64+
../lib/liblinuxcnc-uspace-rtai.so.0: $(call TOOBJS, $(USPACE_RTAI_SRCS))
6565
$(ECHO) Linking $(notdir $@)
6666
$(Q)$(CXX) -shared $(LDFLAGS) -o $@ $^ $(RTAI_LXRT_LDFLAGS) -Wl,-soname,$(notdir $@)
67-
TARGETS += ../lib/libuspace-rtai.so.0
68-
TARGETS += ../lib/libuspace-rtai.so
67+
TARGETS += ../lib/liblinuxcnc-uspace-rtai.so.0
68+
TARGETS += ../lib/liblinuxcnc-uspace-rtai.so
6969
endif
7070

7171
ifeq ($(CONFIG_USPACE_XENOMAI),y)
7272
USPACE_XENOMAI_SRCS := rtapi/uspace_xenomai.cc
7373
USERSRCS += $(USPACE_XENOMAI_SRCS)
7474
$(call TOOBJSDEPS, $(USPACE_XENOMAI_SRCS)): EXTRAFLAGS += -fPIC $(XENOMAI_CFLAGS)
75-
../lib/libuspace-xenomai.so.0: $(call TOOBJS, $(USPACE_XENOMAI_SRCS))
75+
../lib/liblinuxcnc-uspace-xenomai.so.0: $(call TOOBJS, $(USPACE_XENOMAI_SRCS))
7676
$(ECHO) Linking $(notdir $@)
7777
$(Q)$(CXX) -shared $(LDFLAGS) -o $@ $^ $(XENOMAI_LDFLAGS) -Wl,-soname,$(notdir $@)
78-
TARGETS += ../lib/libuspace-xenomai.so.0
79-
TARGETS += ../lib/libuspace-xenomai.so
78+
TARGETS += ../lib/liblinuxcnc-uspace-xenomai.so.0
79+
TARGETS += ../lib/liblinuxcnc-uspace-xenomai.so
8080
endif
8181

8282
ifeq ($(CONFIG_USPACE_XENOMAI_EVL),y)
8383
USPACE_XENOMAI_EVL_SRCS := rtapi/uspace_xenomai_evl.cc
8484
USERSRCS += $(USPACE_XENOMAI_EVL_SRCS)
8585
$(call TOOBJSDEPS, $(USPACE_XENOMAI_EVL_SRCS)): EXTRAFLAGS += -fPIC $(XENOMAI_EVL_CFLAGS)
86-
../lib/libuspace-xenomai-evl.so.0: $(call TOOBJS, $(USPACE_XENOMAI_EVL_SRCS))
86+
../lib/liblinuxcnc-uspace-xenomai-evl.so.0: $(call TOOBJS, $(USPACE_XENOMAI_EVL_SRCS))
8787
$(ECHO) Linking $(notdir $@)
8888
$(Q)$(CXX) -shared $(LDFLAGS) -o $@ $^ $(XENOMAI_EVL_LDFLAGS) -Wl,-soname,$(notdir $@)
89-
TARGETS += ../lib/libuspace-xenomai-evl.so.0
90-
TARGETS += ../lib/libuspace-xenomai-evl.so
89+
TARGETS += ../lib/liblinuxcnc-uspace-xenomai-evl.so.0
90+
TARGETS += ../lib/liblinuxcnc-uspace-xenomai-evl.so
9191
endif

src/rtapi/uspace_rtapi_main.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -770,17 +770,17 @@ static RtapiApp *makeDllApp(std::string dllName, int policy) {
770770
static RtapiApp *makeApp() {
771771
RtapiApp *app;
772772
if (WithRoot::getEuid() != 0 || harden_rt() < 0) {
773-
app = makeDllApp("libuspace-posix.so.0", SCHED_OTHER);
773+
app = makeDllApp("liblinuxcnc-uspace-posix.so.0", SCHED_OTHER);
774774
} else {
775775
WithRoot r;
776776
if (detect_xenomai_evl()) {
777-
app = makeDllApp("libuspace-xenomai-evl.so.0", SCHED_FIFO);
777+
app = makeDllApp("liblinuxcnc-uspace-xenomai-evl.so.0", SCHED_FIFO);
778778
} else if (detect_xenomai()) {
779-
app = makeDllApp("libuspace-xenomai.so.0", SCHED_FIFO);
779+
app = makeDllApp("liblinuxcnc-uspace-xenomai.so.0", SCHED_FIFO);
780780
} else if (detect_rtai()) {
781-
app = makeDllApp("libuspace-rtai.so.0", SCHED_FIFO);
781+
app = makeDllApp("liblinuxcnc-uspace-rtai.so.0", SCHED_FIFO);
782782
} else {
783-
app = makeDllApp("libuspace-posix.so.0", SCHED_FIFO);
783+
app = makeDllApp("liblinuxcnc-uspace-posix.so.0", SCHED_FIFO);
784784
}
785785
}
786786

0 commit comments

Comments
 (0)