aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-09-05 15:04:45 +0000
committerGravatar Brendan Taylor <whateley@gmail.com>2011-09-05 15:04:45 +0000
commit0ddedde7e75bdaa514ccab8c7c2b6afe2acca2c9 (patch)
treeed424ac28ac0eb4caeefd76d2f0bc4cea8d53a56
parenta42eadc04ffde59aae1d1238e6595950d4e9194f (diff)
simplify the Makefile a bit
-rw-r--r--Makefile22
1 files changed, 3 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index fa765a5..6c2269f 100644
--- a/Makefile
+++ b/Makefile
@@ -98,17 +98,7 @@ test-uzbl-tabbed-sandbox: uzbl-browser
clean:
rm -f uzbl-core
- rm -f uzbl-core.o
- rm -f events.o
- rm -f callbacks.o
- rm -f inspector.o
- rm -f cookie-jar.o
- rm -f util.o
- rm -f commands.o
- rm -f io.o
- rm -f menu.o
- rm -f status-bar.o
- rm -f variables.o
+ rm -f *.o
find ./examples/ -name "*.pyc" -delete
cd ./tests/; $(MAKE) clean
rm -rf ./sandbox/
@@ -133,18 +123,12 @@ install-uzbl-core: all install-dirs
install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core
install-event-manager: install-dirs
- install -m755 bin/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
- mv $(INSTALLDIR)/bin/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager.bak
- sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < $(INSTALLDIR)/bin/uzbl-event-manager.bak > $(INSTALLDIR)/bin/uzbl-event-manager
+ sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < bin/uzbl-event-manager > $(INSTALLDIR)/bin/uzbl-event-manager
chmod 755 $(INSTALLDIR)/bin/uzbl-event-manager
- rm $(INSTALLDIR)/bin/uzbl-event-manager.bak
install-uzbl-browser: install-dirs install-uzbl-core install-event-manager
- install -m755 bin/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
- mv $(INSTALLDIR)/bin/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser.bak
- sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < $(INSTALLDIR)/bin/uzbl-browser.bak > $(INSTALLDIR)/bin/uzbl-browser
+ sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < bin/uzbl-browser > $(INSTALLDIR)/bin/uzbl-browser
chmod 755 $(INSTALLDIR)/bin/uzbl-browser
- rm $(INSTALLDIR)/bin/uzbl-browser.bak
cp -r examples $(INSTALLDIR)/share/uzbl/
chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/*