[tomcat-native] branch master updated: BZ 64260: Clean up install target

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
     new 853a2ab  BZ 64260: Clean up install target
853a2ab is described below

commit 853a2abcd54cc58cf19aaddb093a9f46ff248336
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Mar 25 11:45:05 2020 +0100

    BZ 64260: Clean up install target
    
    Remove bin/, include/, lib/pkgconfig/ from install target since they have no
    use for the outside world and rather might confuse people. libtcnative is
    solely intended to be loaded dynamically from within the JVM and not be used
    as a library for other C clients.
    The archive cannot be easily removed w/o restructuring configure.ac and
    Makefile.in. The conceptual flaw is to rely on libtool generated for APR,
    rather than generating a libtool in-place with *_DISABLE_STATIC/*_PROG_LIBTOOL
    through autoreconf. A proper approach is taken by Subversion's build/ac-macros/apr.mk.
    
    This closes #7
---
 native/Makefile.in                | 15 +++------------
 native/configure.in               |  1 -
 native/tcnative.pc.in             | 30 ------------------------------
 xdocs/miscellaneous/changelog.xml |  3 +++
 4 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/native/Makefile.in b/native/Makefile.in
index 2c4a5c8..da0fe03 100644
--- a/native/Makefile.in
+++ b/native/Makefile.in
@@ -37,7 +37,6 @@ TCNATIVE_LIBS = @TCNATIVE_LIBS@
 
 TARGET_LIB = lib@TCNATIVE_LIBNAME@.la
 EXTRA_OS_LINK=@EXTRA_OS_LINK@
-TCNATIVE_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -51,29 +50,21 @@ LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPI
 CLEAN_SUBDIRS = test
 
 CLEAN_TARGETS = .make.dirs
-DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
-	build/rules.mk tcnative.pc
+DISTCLEAN_TARGETS = config.cache config.log config.status \
+	build/rules.mk
 EXTRACLEAN_TARGETS = configure aclocal.m4 build-outputs.mk \
 	build/apr_common.m4 build/find_apr.m4 build/install.sh \
 	build/config.guess build/config.sub tcnative.spec
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-bindir=@bindir@
 libdir=@libdir@
-includedir=@includedir@
 top_srcdir=@abs_srcdir@
 top_blddir=@abs_builddir@
 
 
 install: $(TARGET_LIB)
-	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
-	$(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
-	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
-		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	done
+	$(APR_MKDIR) $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
 
 $(TARGET_LIB): $(OBJECTS)
diff --git a/native/configure.in b/native/configure.in
index 3d2d9e1..ee9ff2f 100644
--- a/native/configure.in
+++ b/native/configure.in
@@ -276,7 +276,6 @@ dnl
 dnl everything is done.
 MAKEFILES="Makefile"
 AC_OUTPUT([
-    tcnative.pc
     $MAKEFILES
 	],[
 TCNATIVE_MAJOR_VERSION=$TCNATIVE_MAJOR_VERSION
diff --git a/native/tcnative.pc.in b/native/tcnative.pc.in
deleted file mode 100644
index 1fd7cb8..0000000
--- a/native/tcnative.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
-includedir=@includedir@
-
-Name: Tomcat native Java
-Description: Companion Native Java library
-Version: @TCNATIVE_DOTTED_VERSION@
-# assume that tcnative requires libapr of same major version
-Requires: apr-1
-Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
-Cflags: -I${includedir}
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index b0d3ed0..93d76a4 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -37,6 +37,9 @@
 <section name="Changes in 1.2.24">
   <changelog>
     <update>
+      <bug>64260</bug>: Clean up install target. (michaelo)
+    </update>
+    <update>
       Drop obsolete build time workarounds for HP-UX. (michaelo)
     </update>
     <add>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org