From ce5653d75c29954e68c9c912e1c731306f9306fa Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 28 Aug 2013 00:39:15 +0200 Subject: BUILD: add --with-theme-manager configure option --- src/Makefile.am | 4 ++++ src/htm/Makefile.am | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 src/htm/Makefile.am (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 78856692..6cb77148 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,3 +12,7 @@ gtk_fe = fe-gtk endif SUBDIRS = pixmaps common $(gtk_fe) $(text_fe) + +if WITH_TM +SUBDIRS += htm +endif diff --git a/src/htm/Makefile.am b/src/htm/Makefile.am new file mode 100644 index 00000000..4a7c54ff --- /dev/null +++ b/src/htm/Makefile.am @@ -0,0 +1,14 @@ +MDTOOL_OPTS = --verbose + +theme_SCRIPTS = thememan.exe thememan +themedir = $(bindir) + +thememan.exe: htm-mono.csproj + $(MDTOOL) $(MDTOOL_OPTS) build $< + +thememan: + @echo "#!/bin/sh" > $@ + @echo "exec mono /usr/bin/thememan.exe \"$@\"" >> $@ + +clean-local: + rm -f thememan.exe thememan.exe.config thememan.exe.mdb thememan Main.resources -- cgit 1.4.1 From 7dea09c3714d62777ef7bdc82013af6deaa3a9db Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 28 Aug 2013 01:12:36 +0200 Subject: BUILD: fix quoting issue \"$@\" got malformed and interpreted by the Makefile --- src/htm/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/htm/Makefile.am b/src/htm/Makefile.am index 4a7c54ff..be564f6d 100644 --- a/src/htm/Makefile.am +++ b/src/htm/Makefile.am @@ -7,8 +7,8 @@ thememan.exe: htm-mono.csproj $(MDTOOL) $(MDTOOL_OPTS) build $< thememan: - @echo "#!/bin/sh" > $@ - @echo "exec mono /usr/bin/thememan.exe \"$@\"" >> $@ + @echo '#!/bin/sh' > $@ + @echo 'exec mono /usr/bin/thememan.exe "$$@"' >> $@ clean-local: rm -f thememan.exe thememan.exe.config thememan.exe.mdb thememan Main.resources -- cgit 1.4.1 From 8f0d6e85fdadc343fcf2b117ef922ab430c2b264 Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 28 Aug 2013 01:15:41 +0200 Subject: BUILD: don't hardcode the install path in the script --- src/htm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/htm/Makefile.am b/src/htm/Makefile.am index be564f6d..5c387e36 100644 --- a/src/htm/Makefile.am +++ b/src/htm/Makefile.am @@ -8,7 +8,7 @@ thememan.exe: htm-mono.csproj thememan: @echo '#!/bin/sh' > $@ - @echo 'exec mono /usr/bin/thememan.exe "$$@"' >> $@ + @echo 'exec mono "$(bindir)/thememan.exe" "$$@"' >> $@ clean-local: rm -f thememan.exe thememan.exe.config thememan.exe.mdb thememan Main.resources -- cgit 1.4.1 From 08fd4f2dd73f198ad12a219fac91f743e3c9c6b6 Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 28 Aug 2013 02:55:08 +0200 Subject: BUILD: use thememan.in instead of Makefile echo --- configure.ac | 1 + src/htm/Makefile.am | 6 ++---- src/htm/thememan.in | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/htm/thememan.in (limited to 'src') diff --git a/configure.ac b/configure.ac index 6f217fcb..4e47cf7e 100644 --- a/configure.ac +++ b/configure.ac @@ -969,6 +969,7 @@ src/common/dbus/Makefile src/fe-text/Makefile src/fe-gtk/Makefile src/htm/Makefile +src/htm/thememan src/pixmaps/Makefile plugins/Makefile plugins/python/Makefile diff --git a/src/htm/Makefile.am b/src/htm/Makefile.am index 5c387e36..85480402 100644 --- a/src/htm/Makefile.am +++ b/src/htm/Makefile.am @@ -6,9 +6,7 @@ themedir = $(bindir) thememan.exe: htm-mono.csproj $(MDTOOL) $(MDTOOL_OPTS) build $< -thememan: - @echo '#!/bin/sh' > $@ - @echo 'exec mono "$(bindir)/thememan.exe" "$$@"' >> $@ - clean-local: rm -f thememan.exe thememan.exe.config thememan.exe.mdb thememan Main.resources + +EXTRA_DIST = thememan.in diff --git a/src/htm/thememan.in b/src/htm/thememan.in new file mode 100644 index 00000000..f6f80df6 --- /dev/null +++ b/src/htm/thememan.in @@ -0,0 +1,3 @@ +#!/bin/sh +exec_prefix="@exec_prefix@" +exec mono "@bindir@/thememan.exe" "$@" -- cgit 1.4.1