projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 793a9e4)
glib/Makefile.am gmodule/Makefile.am Current GNU tools do understand the
authorTor Lillqvist <tml@novell.com>
Fri, 24 Jun 2005 13:26:45 +0000 (13:26 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Fri, 24 Jun 2005 13:26:45 +0000 (13:26 +0000)
2005-06-24  Tor Lillqvist  <tml@novell.com>

* glib/Makefile.am
* gmodule/Makefile.am
* gobject/Makefile.am: Current GNU tools do understand the
PRIVATE keyword.

* glib/gfileutils.c (g_mkdir_with_parents): Return error with
EINVAL also for empty pathnames.
(g_build_pathname_va): Fix typo.

ChangeLog patch | blob | history
ChangeLog.pre-2-10 patch | blob | history
ChangeLog.pre-2-12 patch | blob | history
ChangeLog.pre-2-8 patch | blob | history
glib/Makefile.am patch | blob | history
glib/gfileutils.c patch | blob | history
gmodule/ChangeLog patch | blob | history
gmodule/Makefile.am patch | blob | history
gobject/ChangeLog patch | blob | history
gobject/Makefile.am patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 483e581..83cab70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * glib/Makefile.am (install-libtool-import-lib): Current GNU tools
+       do understand the PRIVATE keyword.
+
+       * glib/gfileutils.c (g_mkdir_with_parents): Return error with
+       EINVAL also for empty pathnames.
+       (g_build_pathname_va): Fix typo.
+
 Thu Jun 23 15:52:08 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gfileutils.c: g_build_filename_va is only use in the G_OS_WIN32
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 483e581..83cab70 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * glib/Makefile.am (install-libtool-import-lib): Current GNU tools
+       do understand the PRIVATE keyword.
+
+       * glib/gfileutils.c (g_mkdir_with_parents): Return error with
+       EINVAL also for empty pathnames.
+       (g_build_pathname_va): Fix typo.
+
 Thu Jun 23 15:52:08 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gfileutils.c: g_build_filename_va is only use in the G_OS_WIN32
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 483e581..83cab70 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * glib/Makefile.am (install-libtool-import-lib): Current GNU tools
+       do understand the PRIVATE keyword.
+
+       * glib/gfileutils.c (g_mkdir_with_parents): Return error with
+       EINVAL also for empty pathnames.
+       (g_build_pathname_va): Fix typo.
+
 Thu Jun 23 15:52:08 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gfileutils.c: g_build_filename_va is only use in the G_OS_WIN32
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 483e581..83cab70 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * glib/Makefile.am (install-libtool-import-lib): Current GNU tools
+       do understand the PRIVATE keyword.
+
+       * glib/gfileutils.c (g_mkdir_with_parents): Return error with
+       EINVAL also for empty pathnames.
+       (g_build_pathname_va): Fix typo.
+
 Thu Jun 23 15:52:08 2005  Manish Singh  <yosh@gimp.org>
 
        * glib/gfileutils.c: g_build_filename_va is only use in the G_OS_WIN32
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 527cf3c..28e27ed 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -202,15 +202,6 @@ if OS_WIN32
 export_symbols = -export-symbols glib.def
 
 install-libtool-import-lib:
-#      Don't put the binary compatibility entries in the import lib!
-#      (Unfortunately the GNU linker doesn't yet understand the PRIVATE
-#      directive in .def files.)
-#
-       for entry in `grep PRIVATE glib.def | sed -e 's/PRIVATE//'`; do \
-         file=`$(NM) -A .libs/libglib-2.0.dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
-         ar d .libs/libglib-2.0.dll.a $$file; \
-       done
-       $(RANLIB) .libs/libglib-2.0.dll.a
        $(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
        $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
 
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index b809b6a..d46568c 100644 (file)
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -76,7 +76,7 @@ g_mkdir_with_parents (const gchar *pathname,
 {
   gchar *fn, *p;
 
-  if (pathname == NULL)
+  if (pathname == NULL || *pathname == '\0')
     {
       errno = EINVAL;
       return -1;
@@ -1755,7 +1755,7 @@ g_build_path (const gchar *separator,
 #ifdef G_OS_WIN32
 
 static gchar *
-g_build_filename_va (const gchar  *first_element,
+g_build_pathname_va (const gchar  *first_element,
                     va_list       args,
                     gchar       **str_array)
 {
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index f935e3c..3848757 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * Makefile.am (install-libtool-import-lib): Current GNU tools do
+       understand the PRIVATE keyword.
+
 2005-06-10  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.7.0 ===
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index c998d0b..58fffda 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -55,11 +55,6 @@ if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gmodule.def
 
 install-libtool-import-lib:
-#      Don't put the binary compatibility entries in the import lib!
-       for entry in `grep PRIVATE gmodule.def | sed -e 's/PRIVATE//'`; do \
-         file=`nm -A .libs/libgmodule-2.0.dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
-         ar d .libs/libgmodule-2.0.dll.a $$file; \
-       done
        $(INSTALL) .libs/libgmodule-2.0.dll.a $(DESTDIR)$(libdir)
        $(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def
 
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 38041b2..702bcfb 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Tor Lillqvist  <tml@novell.com>
+
+       * Makefile.am (install-libtool-import-lib): Current GNU tools do
+       understand the PRIVATE keyword.
+
 2005-06-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gparam.h (GParamFlags): Avoid a warning.  (#308295,
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 6fcbd33..eb636fd 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -54,15 +54,6 @@ if OS_WIN32
 export_symbols = -export-symbols gobject.def
 
 install-libtool-import-lib:
-#      Don't put the bug compatibility entries in the import lib!
-#      (Unfortunately the GNU linker doesn't yet understand the PRIVATE
-#      directive in .def files.)
-#
-       for entry in `grep PRIVATE gobject.def | sed -e 's/PRIVATE//'`; do \
-         file=`$(NM) -A .libs/libgobject-2.0.dll.a | grep $$entry | head -n 1 | cut -d: -f2`; \
-         ar d .libs/libgobject-2.0.dll.a $$file; \
-       done
-       $(RANLIB) .libs/libgobject-2.0.dll.a
        $(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
        $(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def
 
Domain: System / Base;