[mb-commits] r7726 - in libmusicbrainz/branches/xmlws: . src src/http src/xmlParser test

Author: matt
Date: 2006-05-29 12:03:13 +0000 (Mon, 29 May 2006)
New Revision: 7726

Added:
   libmusicbrainz/branches/xmlws/libmusicbrainz3.pc.in
Removed:
   libmusicbrainz/branches/xmlws/libmusicbrainz.pc.in
Modified:
   libmusicbrainz/branches/xmlws/Makefile.am
   libmusicbrainz/branches/xmlws/SConstruct
   libmusicbrainz/branches/xmlws/configure.ac
   libmusicbrainz/branches/xmlws/src/Makefile.am
   libmusicbrainz/branches/xmlws/src/http/Makefile.am
   libmusicbrainz/branches/xmlws/src/xmlParser/Makefile.am
   libmusicbrainz/branches/xmlws/test/Makefile.am
Log:
More build system tweaks:
Renamed the pkgconfig file to allow parallel installs of libmb2 and 3.
Changed deprecated automake syntax (INCLUDES -> AM_CPPFLAGS).
Added note about versioning to configure.ac.
Tracked down and fixed a weird bug introduced in the 'lib' to 'src' renaming.


Modified: libmusicbrainz/branches/xmlws/Makefile.am
===================================================================
--- libmusicbrainz/branches/xmlws/Makefile.am   2006-05-29 10:42:44 UTC (rev 
7725)
+++ libmusicbrainz/branches/xmlws/Makefile.am   2006-05-29 12:03:13 UTC (rev 
7726)
@@ -24,7 +24,7 @@
 SUBDIRS = src include test
 
 pcdir = $(libdir)/pkgconfig
-pc_DATA = libmusicbrainz.pc
+pc_DATA = libmusicbrainz3.pc
 
-EXTRA_DIST = test-data libmusicbrainz.pc.in Doxyfile.in \
+EXTRA_DIST = test-data libmusicbrainz3.pc.in Doxyfile.in \
        README.win32 config_win32.h.in SConstruct scons

Modified: libmusicbrainz/branches/xmlws/SConstruct
===================================================================
--- libmusicbrainz/branches/xmlws/SConstruct    2006-05-29 10:42:44 UTC (rev 
7725)
+++ libmusicbrainz/branches/xmlws/SConstruct    2006-05-29 12:03:13 UTC (rev 
7726)
@@ -44,8 +44,8 @@
 
 env.Replace(pkgconfigdir='$libdir/pkgconfig')
 env.Alias('install', env.Install('$pkgconfigdir',
-                                 env.EnvSubstFile('libmusicbrainz.pc',
-                                                  'libmusicbrainz.pc.in')))
+                                 env.EnvSubstFile('libmusicbrainz3.pc',
+                                                  'libmusicbrainz3.pc.in')))
 
 # Default targets
 env.Default('src')
@@ -63,7 +63,7 @@
     'SConstruct',
     'TODO',
     'config_win32.h.in',
-    'libmusicbrainz.pc.in',
+    'libmusicbrainz3.pc.in',
     ]
 dist_files += glob.glob('scons/*.py')
 

Modified: libmusicbrainz/branches/xmlws/configure.ac
===================================================================
--- libmusicbrainz/branches/xmlws/configure.ac  2006-05-29 10:42:44 UTC (rev 
7725)
+++ libmusicbrainz/branches/xmlws/configure.ac  2006-05-29 12:03:13 UTC (rev 
7726)
@@ -1,4 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl NOTE: Each time a release is made, the version number below and the
+dnl       libtool version number in src/Makefile.am have to be incremented.
+dnl       The libtool version number has to be changed ALWAYS, no matter how
+dnl       small the change to the source code was!
+dnl
 AC_INIT(libmusicbrainz, 3.0.0dev)
 AC_CONFIG_SRCDIR(src/artist.cpp)
 AM_INIT_AUTOMAKE
@@ -65,6 +71,6 @@
 include/Makefile
 include/musicbrainz3/Makefile
 test/Makefile
-libmusicbrainz.pc
+libmusicbrainz3.pc
 Doxyfile], 
 echo timestamp > stamp-h)

Deleted: libmusicbrainz/branches/xmlws/libmusicbrainz.pc.in

Copied: libmusicbrainz/branches/xmlws/libmusicbrainz3.pc.in (from rev 7725, 
libmusicbrainz/branches/xmlws/libmusicbrainz.pc.in)

Modified: libmusicbrainz/branches/xmlws/src/Makefile.am
===================================================================
--- libmusicbrainz/branches/xmlws/src/Makefile.am       2006-05-29 10:42:44 UTC 
(rev 7725)
+++ libmusicbrainz/branches/xmlws/src/Makefile.am       2006-05-29 12:03:13 UTC 
(rev 7726)
@@ -22,8 +22,8 @@
 
 SUBDIRS = http xmlParser
 
-src_LTLIBRARIES = libmusicbrainz.la
-INCLUDES = -I$(top_srcdir)/include -DMB_API_EXPORTS
+lib_LTLIBRARIES = libmusicbrainz.la
+AM_CPPFLAGS = -I$(top_srcdir)/include -DMB_API_EXPORTS
 
 libmusicbrainz_la_SOURCES = \
        artist.cpp artistalias.cpp disc.cpp entity.cpp filters.cpp \
@@ -46,8 +46,7 @@
 #  6. If any interfaces have been removed since the last public release, then 
 #     set age to 0. 
 #libmusicbrainz_la_LDFLAGS = -version-info 5:0:0 -no-undefined
-libmusicbrainz_la_LDFLAGS = -version-info 4:0:0 -no-undefined
-libmusicbrainz_la_LIBADD = -lstdc++ -lm \
-       http/libhttp.la xmlParser/libxmlParser.la
+libmusicbrainz_la_LDFLAGS = -version-info 4:0:0 -no-undefined -lstdc++ -lm
+libmusicbrainz_la_LIBADD = http/libhttp.la xmlParser/libxmlParser.la
 
 EXTRA_DIST = types.h SConscript

Modified: libmusicbrainz/branches/xmlws/src/http/Makefile.am
===================================================================
--- libmusicbrainz/branches/xmlws/src/http/Makefile.am  2006-05-29 10:42:44 UTC 
(rev 7725)
+++ libmusicbrainz/branches/xmlws/src/http/Makefile.am  2006-05-29 12:03:13 UTC 
(rev 7726)
@@ -6,7 +6,7 @@
 noinst_LTLIBRARIES = libhttp.la
 
 libhttp_la_SOURCES = comhttpsocket.cpp comsocket.cpp http.cpp
-INCLUDES = -I.. -DMB_API_EXPORTS
+AM_CPPFLAGS = -I.. -DMB_API_EXPORTS
 
 EXTRA_DIST = wincomsocket.cpp comhttpsocket.h comsocket.h errors.h http.h \
        wincomsocket.h

Modified: libmusicbrainz/branches/xmlws/src/xmlParser/Makefile.am
===================================================================
--- libmusicbrainz/branches/xmlws/src/xmlParser/Makefile.am     2006-05-29 
10:42:44 UTC (rev 7725)
+++ libmusicbrainz/branches/xmlws/src/xmlParser/Makefile.am     2006-05-29 
12:03:13 UTC (rev 7726)
@@ -6,6 +6,6 @@
 noinst_LTLIBRARIES = libxmlParser.la
 
 libxmlParser_la_SOURCES = xmlParser.cpp
-INCLUDES = -DMB_API_EXPORTS
+AM_CPPFLAGS = -DMB_API_EXPORTS
 
 EXTRA_DIST = xmlParser.h

Modified: libmusicbrainz/branches/xmlws/test/Makefile.am
===================================================================
--- libmusicbrainz/branches/xmlws/test/Makefile.am      2006-05-29 10:42:44 UTC 
(rev 7725)
+++ libmusicbrainz/branches/xmlws/test/Makefile.am      2006-05-29 12:03:13 UTC 
(rev 7726)
@@ -13,9 +13,9 @@
        test_parser_user.cpp test_utils.cpp test_ws_filters.cpp \
        test_ws_includes.cpp
 
-INCLUDES = -I$(top_srcdir)/include @CPPUNIT_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @CPPUNIT_CFLAGS@
 
 test_runner_LDFLAGS = @CPPUNIT_LIBS@
-test_runner_LDADD = $(top_srcdir)/lib/libmusicbrainz.la
+test_runner_LDADD = $(top_srcdir)/src/libmusicbrainz.la
 
 EXTRA_DIST = SConscript