Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rotate, rather than swap, the address field in place in XML hublists.
[doldaconnect.git]
/
clients
/
gtk2
/
Makefile.am
diff --git
a/clients/gtk2/Makefile.am
b/clients/gtk2/Makefile.am
index
6afbb6f
..
13561ad
100644
(file)
--- a/
clients/gtk2/Makefile.am
+++ b/
clients/gtk2/Makefile.am
@@
-1,21
+1,37
@@
+if CLI_GTK2
bin_PROGRAMS=dolcon
bin_PROGRAMS=dolcon
+if !GUISHELL
+app_DATA=dolcon.desktop
+endif
+endif
-dolcon_SOURCES= main.c \
+dolcon_SOURCES= dolcon.c \
+ dolcon.h \
+ hublist.c \
+ hublist.h \
+ hublist-xml.c \
+ hublist-old.c \
progressbar.c \
progressbar.h
progressbar.c \
progressbar.h
-EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc
makegdesc
+EXTRA_DIST=mainwnd.desc inpdialog.desc pref.desc
reslist.desc dolcon.desktop
-BUILT_SOURCES=
mainwnd.gtk inpdialog.gtk pref
.gtk
+BUILT_SOURCES=
mainwnd.gtk inpdialog.gtk pref.gtk reslist
.gtk
-main.c: mainwnd.gtk inpdialog.gtk
+main.c: mainwnd.gtk inpdialog.gtk
pref.gtk reslist.gtk
localedir=$(datadir)/locale
localedir=$(datadir)/locale
-dolcon_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
-dolcon_LDADD=$(top_srcdir)/lib/libdcui.la
-dolcon_CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DLOCALEDIR=\"$(localedir)\"
+dolcon_LDFLAGS= @GTK2_LIBS@ @LIBXML_LIBS@ -lbz2
+dolcon_LDADD=$(top_srcdir)/lib/libdcui.la $(top_srcdir)/common/libhttp.a
+dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
+ -DLOCALEDIR=\"$(localedir)\"
-%.gtk: %.desc makegdesc
- cpp $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $< | ./makegdesc >$@
+.desc.gtk: $(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
mainwnd.desc: ../../config.h
+
+appdir=$(datadir)/applications