You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.2 KiB
68 lines
2.2 KiB
6 years ago
|
--- a/src/Makefile
|
||
|
|
+++ b/src/Makefile
|
||
|
|
@@ -106,6 +106,9 @@
|
||
|
|
XNVCTRL_DIR ?= libXNVCtrl
|
||
|
|
XNVCTRL_MAKEFILE ?= Makefile
|
||
|
|
XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
|
||
|
|
+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
|
||
|
|
+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE)
|
||
|
|
+XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
|
||
|
|
XCONFIG_PARSER_DIR ?= XF86Config-parser
|
||
|
|
COMMON_UTILS_DIR ?= common-utils
|
||
|
|
COMMON_UNIX_DIR ?= common-unix
|
||
|
|
@@ -280,14 +283,17 @@
|
||
|
|
$(MKDIR) $(BINDIR)
|
||
|
|
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
|
||
|
|
|
||
|
|
-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
|
||
|
|
+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
|
||
|
|
+ $(MAKE) -C $(XNVCTRL_DIR)
|
||
|
|
+
|
||
|
|
+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
|
||
|
|
$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
|
||
|
|
- -rdynamic -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) $(LIBS)
|
||
|
|
+ -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
|
||
|
|
$(call quiet_cmd,STRIP_CMD) $@
|
||
|
|
|
||
|
|
$(GTK2LIB): $(GTK2_OBJS) $(XCP_OBJS) $(VERSION_MK)
|
||
|
|
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
|
||
|
|
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
|
||
|
|
+ $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS) \
|
||
|
|
-Wl,--unresolved-symbols=ignore-all -o $(GTK2LIB) \
|
||
|
|
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
|
||
|
|
$(GTK2_OBJS) $(XCP_OBJS)
|
||
|
|
@@ -296,7 +302,7 @@
|
||
|
|
ifdef BUILD_GTK3LIB
|
||
|
|
$(GTK3LIB): $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
|
||
|
|
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
|
||
|
|
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
|
||
|
|
+ $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS) \
|
||
|
|
-Wl,--unresolved-symbols=ignore-all -o $(GTK3LIB) \
|
||
|
|
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
|
||
|
|
$(GTK3_OBJS) $(XCP_OBJS)
|
||
|
|
--- a/src/libXNVCtrl/Makefile
|
||
|
|
+++ b/src/libXNVCtrl/Makefile
|
||
|
|
@@ -55,10 +55,17 @@
|
||
|
|
.PHONY: clean
|
||
|
|
|
||
|
|
all: $(LIBXNVCTRL)
|
||
|
|
+all: libXNVCtrl.so
|
||
|
|
|
||
|
|
$(LIBXNVCTRL) : $(OBJS)
|
||
|
|
$(AR) ru $@ $(OBJS)
|
||
|
|
|
||
|
|
+libXNVCtrl.so: $(OBJS)
|
||
|
|
+ $(RM) $@ $@.*
|
||
|
|
+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
|
||
|
|
+ ln -s $@.0.0.0 $@.0
|
||
|
|
+ ln -s $@.0 $@
|
||
|
|
+
|
||
|
|
# define the rule to build each object file
|
||
|
|
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
|
||
|
|
|
||
|
|
@@ -68,3 +75,4 @@
|
||
|
|
clean:
|
||
|
|
rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
|
||
|
|
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
|
||
|
|
+ rm -f libXNVCtrl.so libXNVCtrl.so.*
|