[patch] Build and link shared libXNVCtrl

0003-Build-and-link-shared-libXNVCtrl.patch (text/plain), 3.94 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2012-02-25 10:46:49 UTC

Build shared libXNVCtrl

Patch written by Kacper Kowalik <[e-mail]>

--- a/utils.mk
+++ b/utils.mk
@@ -58,11 +58,14 @@
 PRINTF                ?= printf
 MKDIR                 ?= mkdir -p
 RM                    ?= rm -f
+LN_S                  ?= ln -s
 TOUCH                 ?= touch
 WHOAMI                ?= whoami
 HOSTNAME_CMD          ?= hostname
 DATE                  ?= date
 GZIP_CMD              ?= gzip
+RANLIB                ?= ranlib
+AR                    ?= ar rcs
 
 NV_AUTO_DEPEND        ?= 1
 NV_VERBOSE            ?= 0
@@ -125,9 +127,11 @@
 
 PREFIX ?= /usr/local
 
+libdir ?= lib
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
-
+INCDIR = $(DESTDIR)$(PREFIX)/include
+LIBDIR = $(DESTDIR)$(PREFIX)/$(libdir)
 
 ##############################################################################
 # default build rule, so that nothing here in utils.mk accidentally
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@
 ##############################################################################
 
 XNVCTRL_DIR           ?= src/libXNVCtrl
-XNVCTRL_ARCHIVE       ?= $(XNVCTRL_DIR)/libXNVCtrl.a
+XNVCTRL_ARCHIVE       ?= -lXNVCtrl
 XCONFIG_PARSER_DIR    ?= src/XF86Config-parser
 COMMON_UTILS_DIR      ?= src/common-utils
 
@@ -148,11 +148,15 @@
 # build rules
 ##############################################################################
 
-.PNONY: all install NVIDIA_SETTINGS_install MANPAGE_install clean clobber
+.PNONY: all install NVIDIA_SETTINGS_install MANPAGE_install clean clobber libXNVCtrl
 
 all: $(NVIDIA_SETTINGS) $(MANPAGE)
 
+libXNVCtrl:
+	$(MAKE) -C src/libXNVCtrl
+
 install: NVIDIA_SETTINGS_install MANPAGE_install
+	$(MAKE) -C src/libXNVCtrl $@
 
 NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
 	$(MKDIR) $(BINDIR)
@@ -162,7 +166,7 @@
 	$(MKDIR) $(MANDIR)
 	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(MANDIR)/$(notdir $<)
 
-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
+$(NVIDIA_SETTINGS): libXNVCtrl $(OBJS)
 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
 		$(XNVCTRL_ARCHIVE) $(LIBS)
 	$(call quiet_cmd,STRIP_CMD) $@
@@ -174,6 +178,7 @@
 $(eval $(call DEFINE_STAMP_C_RULE, $(OBJS),$(NVIDIA_SETTINGS_PROGRAM_NAME)))
 
 clean clobber:
+	$(MAKE) -C src/libXNVCtrl $@
 	rm -rf $(NVIDIA_SETTINGS) $(MANPAGE) *~ $(STAMP_C) \
 		$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \
 		$(GEN_MANPAGE_OPTS) $(OPTIONS_1_INC)
--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
@@ -19,15 +19,45 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-RANLIB ?= ranlib
-CFLAGS += -fPIC
+include ../../version.mk
+include ../../utils.mk
 
-libXNVCtrl.a : libXNVCtrl.a(NVCtrl.o)
+XNVC_STATIC = libXNVCtrl.a
+XNVC_SHARED = libXNVCtrl.so.$(NVIDIA_VERSION)
+XNVC_SONAME = libXNVCtrl.so.1
+
+XNVC_LIBS = $(XNVC_SHARED)
+ifeq ($(STATIC_XNVC),1)
+XNVC_LIBS += $(XNVC_STATIC)
+endif
+
+all: $(XNVC_LIBS)
+
+$(XNVC_STATIC): NVCtrl.o
+	$(AR) rcs $@ $<
 	$(RANLIB) $@
 
-NVCtrl.o : NVCtrl.h nv_control.h NVCtrlLib.h
-.INTERMEDIATE: NVCtrl.o
+$(XNVC_SHARED): NVCtrl.o_PIC
+	$(call quiet_cmd,LINK) $(LDFLAGS) -shared -Wl,-soname,$(XNVC_SONAME) -o $@ $< `pkg-config --libs xext`
+
+NVCtrl.o: NVCtrl.c NVCtrl.h nv_control.h NVCtrlLib.h
+	$(call quiet_cmd,CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+NVCtrl.o_PIC: NVCtrl.c NVCtrl.h nv_control.h NVCtrlLib.h
+	$(call quiet_cmd,CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
 
 clean ::
-	rm -f libXNVCtrl.a *.o
-.PHONY: clean
+	rm -f $(XNVC_SHARED) $(XNVC_STATIC) $(XNVC_SONAME) *.o *.o_PIC
+
+install:
+	$(INSTALL) -D -m 644 NVCtrl.h $(INCDIR)/NVCtrl/NVCtrl.h
+	$(INSTALL) -m 644 NVCtrlLib.h $(INCDIR)/NVCtrl/NVCtrlLib.h
+	$(INSTALL) -m 644 nv_control.h $(INCDIR)/NVCtrl/nv_control.h
+	$(INSTALL) -D -m 755 $(XNVC_SHARED) $(LIBDIR)/$(XNVC_SHARED)
+	$(LN_S) $(XNVC_SHARED) $(LIBDIR)/$(XNVC_SONAME)
+	$(LN_S) $(XNVC_SHARED) $(LIBDIR)/libXNVCtrl.so
+ifeq ($(STATIC_XNVC),1)
+	$(INSTALL) -m 644 $(XNVC_STATIC) $(DESTDIR)$(PREFIX)/$(libdir)/$(XNVC_STATIC)
+endif
+
+.PHONY: clean install all