From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 21 Jul 2007 03:51:02 +0000 (+0200)
Subject: Merge branch 'dolcon-split'
X-Git-Tag: 1.0~106
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=d05758f6eda21695e6215d60d28b9747d0b8aaa3;hp=-c;p=doldaconnect.git

Merge branch 'dolcon-split'

Conflicts:

	po/sv.po
---

d05758f6eda21695e6215d60d28b9747d0b8aaa3
diff --combined clients/gtk2/Makefile.am
index b79d524,3dd77a3..50efcd7
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@@ -3,24 -3,31 +3,31 @@@ bin_PROGRAMS=dolco
  app_DATA=dolcon.desktop
  endif
  
- dolcon_SOURCES=	main.c \
+ dolcon_SOURCES=	dolcon.c \
+ 		hublist.c \
+ 		hublist.h \
+ 		hublist-xml.c \
+ 		hublist-old.c \
  		progressbar.c \
  		progressbar.h
  
  EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc reslist.desc dolcon.desktop
  
- BUILT_SOURCES=mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
+ BUILT_SOURCES=	mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
  
  main.c: mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
  
  localedir=$(datadir)/locale
 -dolcon_LDFLAGS=	@GTK2_LDADD@ @LIBXML_LDADD@
 +dolcon_LDFLAGS=	@GTK2_LIBS@ @LIBXML_LIBS@
  dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
  dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
  		-DLOCALEDIR=\"$(localedir)\"
  
  .desc.gtk: $(top_srcdir)/common/makegdesc
- 	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< | $(top_srcdir)/common/makegdesc >$@
+ 	target="$@"; \
+ 	basename="$${target%.gtk}"; \
+ 	cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< \
+ 	 | $(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" >$@
  
  mainwnd.desc: ../../config.h
  
diff --combined config/util/Makefile.am
index 08fe0c4,732cdc2..6f84a4e
--- a/config/util/Makefile.am
+++ b/config/util/Makefile.am
@@@ -17,12 -17,14 +17,14 @@@ baseconv_LDADD=$(top_srcdir)/common/lib
  
  dolconf.c: dolconf-assistant.desc dolconf-wnd.desc
  localedir=$(datadir)/locale
 -dolconf_LDFLAGS=	@GTK2_LDADD@
 +dolconf_LDFLAGS=	@GTK2_LIBS@
  dolconf_CPPFLAGS=	@GTK2_CFLAGS@ \
  			-DLOCALEDIR=\"$(localedir)\"
  dolconf_LDADD=		$(top_srcdir)/common/libcommon.a $(top_srcdir)/lib/libdcui.la
  
  .desc.gtk: $(top_srcdir)/common/makegdesc
- 	$(top_srcdir)/common/makegdesc $< >$@
+ 	target="$@"; \
+ 	basename="$${target%.gtk}"; \
+ 	$(top_srcdir)/common/makegdesc -h "$${basename}.gtkh" $< >$@
  
  EXTRA_DIST=dolconf-assistant.desc dolconf-wnd.desc