Bugfixes to autotools for GtkFormUI.

diff --git a/configure.ac b/configure.ac
index d8c6087cdcc445acf7669822f89883fd089a53f6..d74cfe1543c82db1654c4b03a54cd5b9b3125635 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE
 
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_SYSTEM

diff --git a/ui/Makefile.am b/ui/Makefile.am
index e4f45039813c87e2e0758d16adea2f8fef5fcca4..5f127a8374bb110c9f7e83285f7866e21c756805 100644 (file)
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -18,20 +18,20 @@ SUBDIRS = . \
 
 AM_CPPFLAGS = $(WARN_CFLAGS) \
               $(DISABLE_DEPRECATED_CFLAGS) \
-              $(GTKFORMUI_CFLAGS) \
               $(GTKFORM_CFLAGS) \
               -DLOCALEDIR=\"$(localedir)\" \
               -DMODULESDIR=\""$(libdir)/$(PACKAGE)/modules"\" \
               -DG_LOG_DOMAIN=\"GtkFormUI\"
 
-LIBS = $(GTKFORMUI_LIBS) \
-       $(GTKFORM_LIBS)
+LIBS = $(GTKFORM_LIBS)
 
 lib_LTLIBRARIES = libgtkformui.la
 
 libgtkformui_la_SOURCES = gtkformdecoder.c \
                           gtkformwidgetdecoder.c
 
+libgtkformui_la_LIBADD = $(top_builddir)/src/libgtkform.la
+
 libgtkformui_la_LDFLAGS = -no-undefined
 
 libgtkformui_include_HEADERS = gtkformdecoder.h \
@@ -44,4 +44,4 @@ install-exec-hook:
        ln -s -f $(libmodulesdir)/libgtkformui$(libmodulesext) .
 
 uninstall-hook:
-       rm -f $(libdir)/$(PACKAGE)/modules/libgtkdateentry$(libmodulesext)
+       rm -f $(libdir)/$(PACKAGE)/modules/libgtkformui$(libmodulesext)

diff --git a/ui/glade/Makefile.am b/ui/glade/Makefile.am
index 8d22cb8774b4b811def3cdcaa355838178714ef9..be8b7223c8a25df0361a7e7fa4fb63fe04add10d 100644 (file)
--- a/ui/glade/Makefile.am
+++ b/ui/glade/Makefile.am
@@ -1,16 +1,26 @@
 SUBDIRS = icons
 
-moduledir = `pkg-config --variable=moduledir gladeui-1.0`
+glademodulesdir = `pkg-config --variable=moduledir gladeui-1.0`
 
-catalogsdir = `pkg-config --variable=catalogdir gladeui-1.0`
+gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-1.0`
 
-catalogs_DATA = gtkformui.xml
+gladecatalogs_DATA = gtkformui.xml
 
-EXTRA_DIST = $(catalogs_DATA)
+EXTRA_DIST = $(gladecatalogs_DATA)
+
+if PLATFORM_WIN32
+libmodulesext = -0.dll
+libmodulesextglade = .dll
+libmodulesdir = $(bindir)
+else
+libmodulesext = .so
+libmodulesextglade = $(libmodulesext)
+libmodulesdir = $(libdir)
+endif
 
 install-exec-hook:
-       cd $(moduledir) && \
-       ln -s -f $(libdir)/libgtkformui.so .
+       cd $(glademodulesdir) && \
+       ln -s -f $(libmodulesdir)/libgtkformui$(libmodulesext) libgtkformui$(libmodulesextglade)
 
 uninstall-hook:
-       rm -f $(moduledir)/libgtkformui.so
+       rm -f $(glademodulesdir)/libgtkformui$(libmodulesextglade)