Skip to Content.
Sympa Menu

freetds - Automake patch

freetds AT lists.ibiblio.org

Subject: FreeTDS Development Group

List archive

Automake patch

Chronological Thread  
    < Chronological >       < Thread >
  • From: Frediano Ziglio <freddyz77 AT tin.it>
  • To: FreeTDS <freetds AT franklin.oit.unc.edu>
  • Subject: Automake patch
  • Date: 11 Sep 2002 21:51:01 +0200
This patch seem quite long but do only some thing:
- it do not install not required include files
- install include in /usr/include/freetds instead of /usr/include
- cleanup spec file using make install instead of manually install

I don't know if this patch should go on 0.60...

Also in rpm we do not install *.la files... There's a reason for this ?

freddy77

Index: Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/Makefile.am,v
retrieving revision 1.13
diff -u -u -1 -0 -r1.13 Makefile.am
--- Makefile.am	10 Sep 2002 19:58:16 -0000	1.13
+++ Makefile.am	11 Sep 2002 19:42:54 -0000
@@ -1,32 +1,27 @@
 SUBDIRS		=	include src doc
 
 EXTRA_DIST	=	interfaces samples/debug.c PWD BUGS \
 		samples/README samples/dyntest.c samples/odbc.ini \
 		samples/odbctest.php samples/odbctest.pl samples/test.php \
 		samples/test.pl \
 		freetds.conf locales.conf acconfig.h \
 		autogen.sh freetds.spec.in freetds.spec
 
-DEFDIR		=	$(prefix)
-ETC		=	$(sysconfdir)
+ETC            =       $(DESTDIR)/$(sysconfdir)
 
 install-data-local:
-	$(mkinstalldirs) $(DEFDIR) $(ETC)
-	if [ -f $(ETC)/freetds.conf ]; \
-	then :; \
-	else \
+	$(mkinstalldirs) $(ETC)
+	if test ! -f $(ETC)/freetds.conf; then \
 		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
 	fi
-	if [ -f $(ETC)/locales.conf ]; \
-	then :; \
-	else \
+	if test ! -f $(ETC)/locales.conf; then \
 		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
 	fi
 
 test:
 	@echo "The 'make test' option has been replaced with 'make check'";
 
 all-redirect:
 	if test ! -f PWD; then cp $(srcdir)/PWD PWD; fi
 
 snapshot:
Index: freetds.spec.in
===================================================================
RCS file: /cvsroot/freetds/freetds/freetds.spec.in,v
retrieving revision 1.3
diff -u -u -1 -0 -r1.3 freetds.spec.in
--- freetds.spec.in	11 Sep 2002 16:23:26 -0000	1.3
+++ freetds.spec.in	11 Sep 2002 19:42:54 -0000
@@ -19,79 +19,47 @@
 Summary: Include files needed for development with FreeTDS 
 Requires: freetds = %{version}
  
 %description devel 
 The freetds-devel package contains the files necessary for development with with the Free TDS libraries. 
  
 %prep 
 %setup 
  
 %build 
-%configure --with-tdsver=4.2 --prefix=/usr --with-unixodbc=/usr/local --sysconfdir=/etc/freetds
+%configure --with-tdsver=4.2 --prefix=/usr --with-unixodbc=/usr/local
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
  
 %install 
-rm -rf $RPM_BUILD_ROOT 
-mkdir -p $RPM_BUILD_ROOT%{_libdir} 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/freetds 
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/freetds 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} 
-
-install -c -m 644 freetds.conf $RPM_BUILD_ROOT%{_sysconfdir}
+rm -rf "$RPM_BUILD_ROOT"
+make DESTDIR="$RPM_BUILD_ROOT" install
 
-libtool --mode=install /usr/bin/install -c -m 755 src/tds/libtds.la $RPM_BUILD_ROOT%{_libdir}/$p 
-libtool --mode=install /usr/bin/install -c -m 755 src/dblib/libsybdb.la $RPM_BUILD_ROOT%{_libdir}/$p 
-libtool --mode=install /usr/bin/install -c -m 755 src/ctlib/libct.la $RPM_BUILD_ROOT%{_libdir}/$p 
-libtool --mode=install /usr/bin/install -c -m 755 src/odbc/libtdsodbc.la $RPM_BUILD_ROOT%{_libdir}/$p 
-
-# devel 
-list="bkpublic cstypes cspublic ctlib ctpublic dblib sqldb sqlfront" 
-list="$list sybdb syberror sybfront tds tdsver tdsconvert tdsutil tds_configs" 
-for p in $list; do 
-	install -c -m 644 include/$p.h $RPM_BUILD_ROOT%{_includedir}/freetds 
-done 
- 
 %post 
 /sbin/ldconfig 
  
 %clean 
 rm -rf $RPM_BUILD_ROOT 
  
 %files 
 %defattr(-,root,root) 
 %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO 
 %{_libdir}/libct.a
 %{_libdir}/libct.so*
 %{_libdir}/libsybdb.a
 %{_libdir}/libsybdb.so*
 %{_libdir}/libtds.a
 %{_libdir}/libtds.so*
 %{_libdir}/libtdsodbc.a
 %{_libdir}/libtdsodbc.so*
-%config %{_sysconfdir}/freetds.conf
+%config %{_sysconfdir}/*
  
 %files devel 
 %defattr (-,root,root) 
-%{_includedir}/freetds/bkpublic.h 
-%{_includedir}/freetds/cstypes.h 
-%{_includedir}/freetds/cspublic.h 
-%{_includedir}/freetds/ctlib.h 
-%{_includedir}/freetds/ctpublic.h 
-%{_includedir}/freetds/dblib.h 
-%{_includedir}/freetds/sqldb.h 
-%{_includedir}/freetds/sqlfront.h 
-%{_includedir}/freetds/sybdb.h 
-%{_includedir}/freetds/syberror.h 
-%{_includedir}/freetds/sybfront.h 
-%{_includedir}/freetds/tds.h 
-%{_includedir}/freetds/tdsver.h 
-%{_includedir}/freetds/tdsconvert.h 
-%{_includedir}/freetds/tdsutil.h 
-%{_includedir}/freetds/tds_configs.h 
+%{_includedir}/%{name}/*
  
 %changelog 
 * Thu Dec 20 2001 Brian Bruns <camber AT ais.org> 
 - Modifications for 0.53 ver and removing interfaces file
 * Wed Jun 28 2001 Brian Bruns <camber AT ais.org> 
 - Modifications for 0.52 ver and ODBC drivers 
 * Wed Feb 14 2001 David Hollis <dhollis AT emagisoft.com> 
 - First stab at RPM for 0.51 ver 
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/include/Makefile.am,v
retrieving revision 1.6
diff -u -u -1 -0 -r1.6 Makefile.am
--- include/Makefile.am	16 Aug 2002 16:45:20 -0000	1.6
+++ include/Makefile.am	11 Sep 2002 19:42:54 -0000
@@ -1,11 +1,11 @@
-include_HEADERS	=	cspublic.h ctpublic.h sybdb.h sybfront.h          \
+pkginclude_HEADERS	=	cspublic.h ctpublic.h sybdb.h sybfront.h  \
 			tdsutil.h bkpublic.h cstypes.h dblib.h syberror.h \
 			ctlib.h sqldb.h sqlfront.h                        \
 			tds.h tdsver.h tdsconvert.h tds_configs.h tdsodbc.h
 
 EXTRA_DIST     =    tds_configs.h.in tds_configs.h \
 		tdsiconv.h
 
 all-local: tds_configs.h 
 
 tds_configs.h: tds_configs.h.in Makefile
Index: src/apps/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/apps/Makefile.am,v
retrieving revision 1.2
diff -u -u -1 -0 -r1.2 Makefile.am
--- src/apps/Makefile.am	28 Jun 2002 18:49:23 -0000	1.2
+++ src/apps/Makefile.am	11 Sep 2002 19:42:54 -0000
@@ -1,8 +1,7 @@
-include_HEADERS = freebcp.h
 bin_PROGRAMS   =    tsql freebcp
 INCLUDES  =    -I$(top_srcdir)/include 
 LDADD     =    ../tds/libtds.la
 freebcp_LDADD     =    ../dblib/libsybdb.la
 
 freebcp_SOURCES = freebcp.c freebcp.h
 
Index: src/ctlib/unittests/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/ctlib/unittests/Makefile.am,v
retrieving revision 1.4
diff -u -u -1 -0 -r1.4 Makefile.am
--- src/ctlib/unittests/Makefile.am	21 Aug 2002 12:19:18 -0000	1.4
+++ src/ctlib/unittests/Makefile.am	11 Sep 2002 19:42:54 -0000
@@ -1,14 +1,13 @@
 TESTS		=	t0001 t0002 t0003 t0004 t0005 t0006 t0007
 check_PROGRAMS	=	t0001 t0002 t0003 t0004 t0005 t0006 t0007
 
-t0001_SOURCES	=	t0001.c common.c
-t0002_SOURCES	=	t0002.c common.c
-t0003_SOURCES	=	t0003.c common.c
-t0004_SOURCES	=	t0004.c common.c
-t0005_SOURCES	=	t0005.c common.c
+t0001_SOURCES	=	t0001.c common.c common.h
+t0002_SOURCES	=	t0002.c common.c common.h
+t0003_SOURCES	=	t0003.c common.c common.h
+t0004_SOURCES	=	t0004.c common.c common.h
+t0005_SOURCES	=	t0005.c common.c common.h
 t0006_SOURCES	=	t0006.c
-t0007_SOURCES	=	t0007.c common.c
+t0007_SOURCES	=	t0007.c common.c common.h
 
 LIBS		=	../libct.la @NETWORK_LIBS@
 INCLUDES	=	-I$(top_srcdir)/include
-include_HEADERS =       common.h
Index: src/dblib/unittests/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/dblib/unittests/Makefile.am,v
retrieving revision 1.9
diff -u -u -1 -0 -r1.9 Makefile.am
--- src/dblib/unittests/Makefile.am	2 Sep 2002 13:26:57 -0000	1.9
+++ src/dblib/unittests/Makefile.am	11 Sep 2002 19:42:54 -0000
@@ -1,39 +1,38 @@
 TESTS		=	t0001 t0002 t0003 t0004 t0005 t0006 t0007 t0008 \
 			t0009 t0010 t0011 t0012 t0013 t0014 t0015 t0016 \
 			t0017 t0018 t0019 t0020 t0021
 EXTRA_PROGRAMS	=	t0001 t0002 t0003 t0004 t0005 t0006 t0007 t0008 \
 			t0009 t0010 t0011 t0012 t0013 t0014 t0015 t0016 \
 			t0017 t0018 t0019 t0020 t0021
 
-t0001_SOURCES	=	t0001.c common.c pwd.c
-t0002_SOURCES	=	t0002.c common.c pwd.c
-t0003_SOURCES	=	t0003.c common.c pwd.c
-t0004_SOURCES	=	t0004.c common.c pwd.c
-t0005_SOURCES	=	t0005.c common.c pwd.c
-t0006_SOURCES	=	t0006.c common.c pwd.c
-t0007_SOURCES	=	t0007.c common.c pwd.c
-t0008_SOURCES	=	t0008.c common.c pwd.c
-t0009_SOURCES	=	t0009.c common.c pwd.c
-t0010_SOURCES	=	t0010.c common.c pwd.c
-t0011_SOURCES	=	t0011.c common.c pwd.c
-t0012_SOURCES	=	t0012.c common.c pwd.c
-t0013_SOURCES	=	t0013.c common.c pwd.c
-t0014_SOURCES	=	t0014.c common.c pwd.c
-t0015_SOURCES	=	t0015.c common.c pwd.c
-t0016_SOURCES	=	t0016.c common.c pwd.c
-t0017_SOURCES	=	t0017.c common.c pwd.c
-t0018_SOURCES	=	t0018.c common.c pwd.c
-t0019_SOURCES	=	t0019.c common.c pwd.c
-t0020_SOURCES	=	t0020.c common.c pwd.c
+t0001_SOURCES	=	t0001.c common.c common.h pwd.c
+t0002_SOURCES	=	t0002.c common.c common.h pwd.c
+t0003_SOURCES	=	t0003.c common.c common.h pwd.c
+t0004_SOURCES	=	t0004.c common.c common.h pwd.c
+t0005_SOURCES	=	t0005.c common.c common.h pwd.c
+t0006_SOURCES	=	t0006.c common.c common.h pwd.c
+t0007_SOURCES	=	t0007.c common.c common.h pwd.c
+t0008_SOURCES	=	t0008.c common.c common.h pwd.c
+t0009_SOURCES	=	t0009.c common.c common.h pwd.c
+t0010_SOURCES	=	t0010.c common.c common.h pwd.c
+t0011_SOURCES	=	t0011.c common.c common.h pwd.c
+t0012_SOURCES	=	t0012.c common.c common.h pwd.c
+t0013_SOURCES	=	t0013.c common.c common.h pwd.c
+t0014_SOURCES	=	t0014.c common.c common.h pwd.c
+t0015_SOURCES	=	t0015.c common.c common.h pwd.c
+t0016_SOURCES	=	t0016.c common.c common.h pwd.c
+t0017_SOURCES	=	t0017.c common.c common.h pwd.c
+t0018_SOURCES	=	t0018.c common.c common.h pwd.c
+t0019_SOURCES	=	t0019.c common.c common.h pwd.c
+t0020_SOURCES	=	t0020.c common.c common.h pwd.c
 t0021_SOURCES	=	t0021.c 
 
 LIBS		=	../libsybdb.la @NETWORK_LIBS@
 INCLUDES	=	-I$(top_srcdir)/include
-include_HEADERS =       common.h
 EXTRA_DIST	=	t0016.in t0017.in data.bin
 
 all-redirect:
 	if test ! -f t0016.in; then cp $(srcdir)/t0016.in t0016.in; fi
 	if test ! -f t0017.in; then cp $(srcdir)/t0017.in t0017.in; fi
 	if test ! -f data.bin; then cp $(srcdir)/data.bin data.bin;  fi
 
Index: src/odbc/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/odbc/Makefile.am,v
retrieving revision 1.14
diff -u -u -1 -0 -r1.14 Makefile.am
--- src/odbc/Makefile.am	4 Sep 2002 20:18:28 -0000	1.14
+++ src/odbc/Makefile.am	11 Sep 2002 19:42:55 -0000
@@ -1,27 +1,26 @@
 SUBDIRS		= unittests
 
-include_HEADERS = connectparams.h odbc_util.h convert_tds2sql.h prepare_query.h convert_sql2string.h
 TDSDIR		=	../tds
 TDSOBJECTS	=	$(TDSDIR)/mem.lo $(TDSDIR)/token.lo \
 		$(TDSDIR)/util.lo $(TDSDIR)/login.lo $(TDSDIR)/read.lo \
 		$(TDSDIR)/write.lo $(TDSDIR)/convert.lo \
 		$(TDSDIR)/numeric.lo $(TDSDIR)/config.lo \
 		$(TDSDIR)/query.lo $(TDSDIR)/iconv.lo \
 		$(TDSDIR)/locale.lo $(TDSDIR)/threadsafe.lo \
 		$(TDSDIR)/challenge.lo
 lib_LTLIBRARIES	=	libtdsodbc.la
 ##EXTRA_LTLIBRARIES	=	libtdsodbc.la
 libtdsodbc_la_SOURCES=	odbc.c connectparams.c convert_tds2sql.c \
 	convert_sql2string.c prepare_query.c odbc_util.c \
 	convert_sql2string.h convert_tds2sql.h odbc_util.h \
-	prepare_query.h
+	prepare_query.h connectparams.h
 EXTRA_DIST = tables.sql
 if UNIXODBC
 libtdsodbc_la_LIBADD=	$(TDSOBJECTS) -lodbcinst $(NETWORK_LIBS) $(LIBICONV)
 else
 libtdsodbc_la_LIBADD=	$(TDSOBJECTS) $(NETWORK_LIBS) $(LIBICONV)
 endif
 INCLUDES	=	-I$(top_srcdir)/include -I$(ODBC_INC)
 
 ## Need blank statement to avoid compiling odbc.c
 odbc: $(EXTRA_LTLIBRARIES)
Index: src/odbc/unittests/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/odbc/unittests/Makefile.am,v
retrieving revision 1.2
diff -u -u -1 -0 -r1.2 Makefile.am
--- src/odbc/unittests/Makefile.am	5 Sep 2002 05:23:01 -0000	1.2
+++ src/odbc/unittests/Makefile.am	11 Sep 2002 19:42:55 -0000
@@ -1,8 +1,7 @@
 TESTS		=	t0001
 check_PROGRAMS	=	t0001
 
-t0001_SOURCES	=	t0001.c common.c
+t0001_SOURCES	=	t0001.c common.c common.h
 
 LIBS		=	-lodbc @NETWORK_LIBS@
 INCLUDES	=	-I$(top_srcdir)/include -I$(ODBC_INC)
-include_HEADERS =       common.h
Index: src/pool/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/pool/Makefile.am,v
retrieving revision 1.3
diff -u -u -1 -0 -r1.3 Makefile.am
--- src/pool/Makefile.am	5 Sep 2002 12:22:08 -0000	1.3
+++ src/pool/Makefile.am	11 Sep 2002 19:42:55 -0000
@@ -1,11 +1,10 @@
 bin_PROGRAMS = tdspool
-tdspool_SOURCES=	config.c  main.c  member.c  stream.c  user.c  util.c	
-include_HEADERS = pool.h
+tdspool_SOURCES	= config.c main.c member.c stream.c user.c util.c pool.h
 TDSDIR		=	../tds
 TDSSOURCES	=	mem.c token.c util.c login.c read.c write.c convert.c numeric.c config.c query.c iconv.c
 SERVERDIR		=	../server
 SERVERSOURCES	=	login.c query.c server.c
 INCLUDES	=	-I$(top_srcdir)/include -I.
 LDADD     =    ../tds/libtds.la ../server/libtdssrv.la
 EXTRA_DIST = BUGS
 
Index: src/tds/unittests/Makefile.am
===================================================================
RCS file: /cvsroot/freetds/freetds/src/tds/unittests/Makefile.am,v
retrieving revision 1.3
diff -u -u -1 -0 -r1.3 Makefile.am
--- src/tds/unittests/Makefile.am	16 Aug 2002 11:00:19 -0000	1.3
+++ src/tds/unittests/Makefile.am	11 Sep 2002 19:42:56 -0000
@@ -1,15 +1,14 @@
 TESTS		=	t0001 t0002 t0003 t0004 t0005 t0006 t0007 t0008
 check_PROGRAMS	=	t0001 t0002 t0003 t0004 t0005 t0006 t0007 t0008
 
-t0001_SOURCES	=	t0001.c common.c
-t0002_SOURCES	=	t0002.c common.c
-t0003_SOURCES	=	t0003.c common.c
-t0004_SOURCES	=	t0004.c common.c
-t0005_SOURCES	=	t0005.c common.c
-t0006_SOURCES	=	t0006.c common.c
+t0001_SOURCES	=	t0001.c common.c common.h
+t0002_SOURCES	=	t0002.c common.c common.h
+t0003_SOURCES	=	t0003.c common.c common.h
+t0004_SOURCES	=	t0004.c common.c common.h
+t0005_SOURCES	=	t0005.c common.c common.h
+t0006_SOURCES	=	t0006.c common.c common.h
 t0007_SOURCES	=	t0007.c
 t0008_SOURCES	=	t0008.c
 
 LIBS		=	../libtds.la @NETWORK_LIBS@
 INCLUDES	=	-I$(top_srcdir)/include
-include_HEADERS =       common.h

  • Automake patch, Frediano Ziglio, 09/11/2002

Archive powered by MHonArc 2.6.24.

Top of Page