Skip to contentSkip to conversation

Fixes to Makefile.am

PATCH In review Samuli Seppänen 3 participants 5 messages Mar 23, 2011 Kbuild

lore
Share & tools
lore

Samuli Seppänen

author
#0 lore raw

PATCH 1/1 Fixes to Makefile.am

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist rules.

Signed-off-by Samuli Seppänen <[email protected]...>
---
 Makefile.am |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
Makefile.am +2 -4
index 1c9468c..194e5b9 100644
@@ -60,9 +60,6 @@ SUBDIRS = \
 TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
 sbin_PROGRAMS = openvpn
 
-dist_noinst_HEADERS = \
-	config-win32.h
-
 dist_noinst_SCRIPTS = \
 	$(TESTS) \
 	doclean \

@@ -75,7 +72,8 @@ dist_noinst_DATA = \
 	COPYRIGHT.GPL \
 	PORTS \
 	INSTALL-win32.txt \
-	service-win32/msvc.mak
+	service-win32/msvc.mak \
+	management/management-notes.txt
 
 openvpn_SOURCES = \
         base64.c base64.h \
Signature · 1 line
1.6.3.3
#1 lore raw

I think management/management-notes.txt should be in dist_doc_DATA so it actually get installed.

2011/3/23 Samuli Seppänen <[email protected]...>

Quoted 47 lines

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist rules.

Signed-off-by Samuli Seppänen <[email protected]...>

---
 Makefile.am |    6 ++----

 1 files changed, 2 insertions(+), 4 deletions(-)
Makefile.am +0 -0
index 1c9468c..194e5b9 100644
@@ -60,9 +60,6 @@ SUBDIRS = \

 TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
 sbin_PROGRAMS = openvpn

Makefile.am +0 -3
-dist_noinst_HEADERS = \
-       config-win32.h
-

 dist_noinst_SCRIPTS = \
       $(TESTS) \
       doclean \

Makefile.am +2 -2
@@ -75,7 +72,8 @@ dist_noinst_DATA = \
        COPYRIGHT.GPL \
        PORTS \
        INSTALL-win32.txt \
-       service-win32/msvc.mak
+       service-win32/msvc.mak \
+       management/management-notes.txt
 
  openvpn_SOURCES = \
         base64.c base64.h \
--

1.6.3.3

------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

author
#2 lore raw

PATCH 1/1 Fixes to Makefile.am

In reply to Samuli Seppänen

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist_doc_DATA.

Signed-off-by Samuli Seppänen <[email protected]...>
---
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Makefile.am +2 -2
index 1c9468c..f311837 100644
@@ -60,8 +60,8 @@ SUBDIRS = \
 TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
 sbin_PROGRAMS = openvpn
 
-dist_noinst_HEADERS = \
-	config-win32.h
+dist_doc_DATA = \
+	management/management-notes.txt
 
 dist_noinst_SCRIPTS = \
 	$(TESTS) \
Signature · 1 line
1.6.3.3
author
#3 lore raw
Quoted 15 lines

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist_doc_DATA.

Signed-off-by Samuli Seppänen <[email protected]...>
---
 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Makefile.am +0 -0
index 1c9468c..f311837 100644

Makefile.am SUBDIRS = \ · line 67

Quoted 10 lines
Makefile.am +2 -2
@@ -60,8 +60,8 @@ SUBDIRS = \
 TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
 sbin_PROGRAMS = openvpn
 
-dist_noinst_HEADERS = \
-	config-win32.h
+dist_doc_DATA = \
+	management/management-notes.txt
 
 dist_noinst_SCRIPTS = \
 	$(TESTS) \

Tested building and installing on Ubuntu 9.10. The "management-notes.txt" ends up in /usr/local/share/doc as it's supposed to.

Signature · 5 lines
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock
Acked-by on v1 1/1
#4 lore raw
In reply to Samuli Seppänen

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 2 lines · Samuli Seppänen

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist_doc_DATA.

ACK. Applied to the beta2.2 branch.

commit ef2cbc771a6cf95868f2bb1c692e3cc9e2be5280

Author: Samuli Seppänen <[email protected]...>
Date:   Wed Mar 23 14:14:32 2011 +0200

Fixes to Makefile.am

Removed reference to config-win32.h, which has been removed. Added management-notes.txt to dist_doc_DATA.

Signed-off-by Samuli Seppänen <[email protected]...>
Acked-by David Sommerseth <[email protected]...>
Signed-off-by David Sommerseth <[email protected]...>

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk2J5i0ACgkQDC186MBRfrr6wgCgnEgYgTiUT/doQ3oQJSlKHt3p xjwAnRmf+1lJybbUuA47v+DzY36k5VOc
=1+9q
-----END PGP SIGNATURE-----