From e96bb7dd9385032ac408b53bc908845791441c83 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 27 Dec 2014 21:45:51 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 24 ++++-- data/16x16/Makefile | 1 + data/Makefile | 9 ++- doc/Makefile | 111 ++++++++++++++-------------- include/Browser/Makefile | 1 + include/Makefile | 1 + po/Makefile | 31 ++++---- src/Makefile | 147 +++++++++++++++++++------------------ src/plugins/Makefile | 155 ++++++++++++++++++++------------------- tests/Makefile | 17 +++-- tools/Makefile | 23 +++--- 11 files changed, 271 insertions(+), 249 deletions(-) diff --git a/Makefile b/Makefile index fa3881e..b540aa1 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ VERSION = 0.4.13 SUBDIRS = data doc include po src src/plugins tests tools RM = rm -f LN = ln -f -TAR = tar -czvf +TAR = tar +MKDIR = mkdir -m 0755 -p all: subdirs @@ -18,9 +19,9 @@ distclean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done dist: - $(RM) -r -- $(PACKAGE)-$(VERSION) - $(LN) -s -- . $(PACKAGE)-$(VERSION) - @$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \ + $(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION) + $(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION) + @cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \ $(PACKAGE)-$(VERSION)/data/Makefile \ $(PACKAGE)-$(VERSION)/data/Browser.pc.in \ $(PACKAGE)-$(VERSION)/data/deforaos-browser.desktop \ @@ -121,7 +122,18 @@ dist: $(PACKAGE)-$(VERSION)/config.h \ $(PACKAGE)-$(VERSION)/config.sh \ $(PACKAGE)-$(VERSION)/project.conf - $(RM) -- $(PACKAGE)-$(VERSION) + $(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION) + +distcheck: dist + $(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz + $(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir + $(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir + (cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/") + (cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install) + (cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall) + (cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean) + (cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist) + $(RM) -r -- $(PACKAGE)-$(VERSION) install: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done @@ -129,4 +141,4 @@ install: uninstall: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done -.PHONY: all subdirs clean distclean dist install uninstall +.PHONY: all subdirs clean distclean dist distcheck install uninstall diff --git a/data/16x16/Makefile b/data/16x16/Makefile index 20b5ac7..26c61c8 100644 --- a/data/16x16/Makefile +++ b/data/16x16/Makefile @@ -1,3 +1,4 @@ +OBJDIR = PREFIX = /usr/local DESTDIR = MKDIR = mkdir -m 0755 -p diff --git a/data/Makefile b/data/Makefile index e866197..d50852e 100644 --- a/data/Makefile +++ b/data/Makefile @@ -2,7 +2,8 @@ SUBDIRS = 16x16 MKDIR = mkdir -m 0755 -p INSTALL = install RM = rm -f -TARGETS = Browser.pc +TARGETS = $(OBJDIR)Browser.pc +OBJDIR = PREFIX = /usr/local DESTDIR = RM = rm -f @@ -16,8 +17,8 @@ all: subdirs $(TARGETS) subdirs: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done -Browser.pc: Browser.pc.in ../config.sh - ./pkgconfig.sh -P "$(PREFIX)" -- "Browser.pc" +$(OBJDIR)Browser.pc: Browser.pc.in ../config.sh + ./pkgconfig.sh -P "$(PREFIX)" -- "$(OBJDIR)Browser.pc" clean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done @@ -32,7 +33,7 @@ distclean: install: $(TARGETS) @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done - ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Browser.pc" + ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)Browser.pc" $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(INSTALL) -m 0644 deforaos-browser.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-browser.desktop $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications diff --git a/doc/Makefile b/doc/Makefile index a03f3ca..2bb2ba2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,4 +1,5 @@ -TARGETS = browser.1 browser.html copy.1 copy.html delete.1 delete.html desktop.1 desktop.html desktopctl.1 desktopctl.html move.1 move.html open.1 open.html properties.1 properties.html view.1 view.html +TARGETS = $(OBJDIR)browser.1 $(OBJDIR)browser.html $(OBJDIR)copy.1 $(OBJDIR)copy.html $(OBJDIR)delete.1 $(OBJDIR)delete.html $(OBJDIR)desktop.1 $(OBJDIR)desktop.html $(OBJDIR)desktopctl.1 $(OBJDIR)desktopctl.html $(OBJDIR)move.1 $(OBJDIR)move.html $(OBJDIR)open.1 $(OBJDIR)open.html $(OBJDIR)properties.1 $(OBJDIR)properties.html $(OBJDIR)view.1 $(OBJDIR)view.html +OBJDIR = PREFIX = /usr/local DESTDIR = RM = rm -f @@ -9,59 +10,59 @@ INSTALL = install all: $(TARGETS) -browser.1: browser.xml - ./docbook.sh -P "$(PREFIX)" -- "browser.1" +$(OBJDIR)browser.1: browser.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)browser.1" -browser.html: browser.css.xml browser.xml manual.css.xml - ./docbook.sh -P "$(PREFIX)" -- "browser.html" +$(OBJDIR)browser.html: browser.css.xml browser.xml manual.css.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)browser.html" -copy.1: copy.xml - ./docbook.sh -P "$(PREFIX)" -- "copy.1" +$(OBJDIR)copy.1: copy.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)copy.1" -copy.html: copy.css.xml copy.xml manual.css.xml - ./docbook.sh -P "$(PREFIX)" -- "copy.html" +$(OBJDIR)copy.html: copy.css.xml copy.xml manual.css.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)copy.html" -delete.1: delete.xml - ./docbook.sh -P "$(PREFIX)" -- "delete.1" +$(OBJDIR)delete.1: delete.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)delete.1" -delete.html: delete.css.xml delete.xml manual.css.xml - ./docbook.sh -P "$(PREFIX)" -- "delete.html" +$(OBJDIR)delete.html: delete.css.xml delete.xml manual.css.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)delete.html" -desktop.1: desktop.xml - ./docbook.sh -P "$(PREFIX)" -- "desktop.1" +$(OBJDIR)desktop.1: desktop.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)desktop.1" -desktop.html: desktop.css.xml desktop.xml manual.css.xml - ./docbook.sh -P "$(PREFIX)" -- "desktop.html" +$(OBJDIR)desktop.html: desktop.css.xml desktop.xml manual.css.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)desktop.html" -desktopctl.1: desktopctl.xml - ./docbook.sh -P "$(PREFIX)" -- "desktopctl.1" +$(OBJDIR)desktopctl.1: desktopctl.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.1" -desktopctl.html: desktopctl.css.xml desktopctl.xml manual.css.xml - ./docbook.sh -P "$(PREFIX)" -- "desktopctl.html" +$(OBJDIR)desktopctl.html: desktopctl.css.xml desktopctl.xml manual.css.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)desktopctl.html" -move.1: move.xml - ./docbook.sh -P "$(PREFIX)" -- "move.1" +$(OBJDIR)move.1: move.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)move.1" -move.html: manual.css.xml move.css.xml move.xml - ./docbook.sh -P "$(PREFIX)" -- "move.html" +$(OBJDIR)move.html: manual.css.xml move.css.xml move.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)move.html" -open.1: open.xml - ./docbook.sh -P "$(PREFIX)" -- "open.1" +$(OBJDIR)open.1: open.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)open.1" -open.html: manual.css.xml open.css.xml open.xml - ./docbook.sh -P "$(PREFIX)" -- "open.html" +$(OBJDIR)open.html: manual.css.xml open.css.xml open.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)open.html" -properties.1: properties.xml - ./docbook.sh -P "$(PREFIX)" -- "properties.1" +$(OBJDIR)properties.1: properties.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)properties.1" -properties.html: manual.css.xml properties.css.xml properties.xml - ./docbook.sh -P "$(PREFIX)" -- "properties.html" +$(OBJDIR)properties.html: manual.css.xml properties.css.xml properties.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)properties.html" -view.1: view.xml - ./docbook.sh -P "$(PREFIX)" -- "view.1" +$(OBJDIR)view.1: view.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)view.1" -view.html: manual.css.xml view.css.xml view.xml - ./docbook.sh -P "$(PREFIX)" -- "view.html" +$(OBJDIR)view.html: manual.css.xml view.css.xml view.xml + ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)view.html" clean: $(RM) -- $(browser.1_OBJS) $(browser.html_OBJS) $(copy.1_OBJS) $(copy.html_OBJS) $(delete.1_OBJS) $(delete.html_OBJS) $(desktop.1_OBJS) $(desktop.html_OBJS) $(desktopctl.1_OBJS) $(desktopctl.html_OBJS) $(move.1_OBJS) $(move.html_OBJS) $(open.1_OBJS) $(open.html_OBJS) $(properties.1_OBJS) $(properties.html_OBJS) $(view.1_OBJS) $(view.html_OBJS) @@ -88,24 +89,24 @@ distclean: clean $(RM) -- $(TARGETS) install: $(TARGETS) - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "browser.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "browser.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "copy.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "copy.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "delete.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktop.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "desktopctl.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "move.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "open.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "open.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "properties.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "properties.html" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "view.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "view.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)browser.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)copy.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)delete.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktop.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)desktopctl.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)move.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)open.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)properties.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.1" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)view.html" uninstall: ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "browser.1" diff --git a/include/Browser/Makefile b/include/Browser/Makefile index b9dadbd..aa415e9 100644 --- a/include/Browser/Makefile +++ b/include/Browser/Makefile @@ -1,3 +1,4 @@ +OBJDIR = PREFIX = /usr/local DESTDIR = RM = rm -f diff --git a/include/Makefile b/include/Makefile index 67456eb..1733639 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,4 +1,5 @@ SUBDIRS = Browser +OBJDIR = PREFIX = /usr/local DESTDIR = RM = rm -f diff --git a/po/Makefile b/po/Makefile index 8a94c19..bb0e25f 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,4 +1,5 @@ -TARGETS = Browser.pot de.mo es.mo fr.mo it.mo +TARGETS = $(OBJDIR)Browser.pot $(OBJDIR)de.mo $(OBJDIR)es.mo $(OBJDIR)fr.mo $(OBJDIR)it.mo +OBJDIR = PREFIX = /usr/local DESTDIR = RM = rm -f @@ -9,20 +10,20 @@ INSTALL = install all: $(TARGETS) -Browser.pot: POTFILES - ./gettext.sh -P "$(PREFIX)" -- "Browser.pot" +$(OBJDIR)Browser.pot: POTFILES + ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)Browser.pot" -de.mo: Browser.pot de.po - ./gettext.sh -P "$(PREFIX)" -- "de.mo" +$(OBJDIR)de.mo: Browser.pot de.po + ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)de.mo" -es.mo: Browser.pot es.po - ./gettext.sh -P "$(PREFIX)" -- "es.mo" +$(OBJDIR)es.mo: Browser.pot es.po + ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)es.mo" -fr.mo: Browser.pot fr.po - ./gettext.sh -P "$(PREFIX)" -- "fr.mo" +$(OBJDIR)fr.mo: Browser.pot fr.po + ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)fr.mo" -it.mo: Browser.pot it.po - ./gettext.sh -P "$(PREFIX)" -- "it.mo" +$(OBJDIR)it.mo: Browser.pot it.po + ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)it.mo" clean: $(RM) -- $(Browser.pot_OBJS) $(de.mo_OBJS) $(es.mo_OBJS) $(fr.mo_OBJS) $(it.mo_OBJS) @@ -36,10 +37,10 @@ distclean: clean $(RM) -- $(TARGETS) install: $(TARGETS) - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "de.mo" - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "es.mo" - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "fr.mo" - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "it.mo" + ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)de.mo" + ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)es.mo" + ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)fr.mo" + ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)it.mo" uninstall: ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -u -- "de.mo" diff --git a/src/Makefile b/src/Makefile index 7798eca..84d6b92 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,5 @@ -TARGETS = libBrowser.a libBrowser.so.0.0 libBrowser.so.0 libBrowser.so browser copy delete desktop desktopctl move open properties view +TARGETS = $(OBJDIR)libBrowser.a $(OBJDIR)libBrowser.so.0.0 $(OBJDIR)libBrowser.so.0 $(OBJDIR)libBrowser.so $(OBJDIR)browser $(OBJDIR)copy $(OBJDIR)delete $(OBJDIR)desktop $(OBJDIR)desktopctl $(OBJDIR)move $(OBJDIR)open $(OBJDIR)properties $(OBJDIR)view +OBJDIR = PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib @@ -21,120 +22,120 @@ INSTALL = install all: $(TARGETS) -libBrowser_OBJS = vfs.o +libBrowser_OBJS = $(OBJDIR)vfs.o libBrowser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -fPIC libBrowser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -libBrowser.a: $(libBrowser_OBJS) - $(AR) -rc libBrowser.a $(libBrowser_OBJS) - $(RANLIB) libBrowser.a +$(OBJDIR)libBrowser.a: $(libBrowser_OBJS) + $(AR) -rc $(OBJDIR)libBrowser.a $(libBrowser_OBJS) + $(RANLIB) $(OBJDIR)libBrowser.a -libBrowser.so.0.0 libBrowser.so.0 libBrowser.so: $(libBrowser_OBJS) - $(CCSHARED) -o libBrowser.so.0.0 -Wl,-soname,libBrowser.so.0 $(libBrowser_OBJS) $(libBrowser_LDFLAGS) - $(LN) -s -- libBrowser.so.0.0 libBrowser.so.0 - $(LN) -s -- libBrowser.so.0.0 libBrowser.so +$(OBJDIR)libBrowser.so.0.0 $(OBJDIR)libBrowser.so.0 $(OBJDIR)libBrowser.so: $(libBrowser_OBJS) + $(CCSHARED) -o $(OBJDIR)libBrowser.so.0.0 -Wl,-soname,libBrowser.so.0 $(libBrowser_OBJS) $(libBrowser_LDFLAGS) + $(LN) -s -- libBrowser.so.0.0 $(OBJDIR)libBrowser.so.0 + $(LN) -s -- libBrowser.so.0.0 $(OBJDIR)libBrowser.so -browser_OBJS = browser.o callbacks.o main.o +browser_OBJS = $(OBJDIR)browser.o $(OBJDIR)callbacks.o $(OBJDIR)main.o browser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) browser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L . -Wl,-rpath,$(LIBDIR) -lBrowser -browser: $(browser_OBJS) libBrowser.a - $(CC) -o browser $(browser_OBJS) $(browser_LDFLAGS) +$(OBJDIR)browser: $(browser_OBJS) libBrowser.a + $(CC) -o $(OBJDIR)browser $(browser_OBJS) $(browser_LDFLAGS) -copy_OBJS = copy.o +copy_OBJS = $(OBJDIR)copy.o copy_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) copy_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -copy: $(copy_OBJS) - $(CC) -o copy $(copy_OBJS) $(copy_LDFLAGS) +$(OBJDIR)copy: $(copy_OBJS) + $(CC) -o $(OBJDIR)copy $(copy_OBJS) $(copy_LDFLAGS) -delete_OBJS = delete.o +delete_OBJS = $(OBJDIR)delete.o delete_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) delete_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -delete: $(delete_OBJS) - $(CC) -o delete $(delete_OBJS) $(delete_LDFLAGS) +$(OBJDIR)delete: $(delete_OBJS) + $(CC) -o $(OBJDIR)delete $(delete_OBJS) $(delete_LDFLAGS) -desktop_OBJS = desktop.o desktopicon.o +desktop_OBJS = $(OBJDIR)desktop.o $(OBJDIR)desktopicon.o desktop_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xrandr` desktop_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xrandr` -L . -Wl,-rpath,$(LIBDIR) -lBrowser -desktop: $(desktop_OBJS) libBrowser.a - $(CC) -o desktop $(desktop_OBJS) $(desktop_LDFLAGS) +$(OBJDIR)desktop: $(desktop_OBJS) libBrowser.a + $(CC) -o $(OBJDIR)desktop $(desktop_OBJS) $(desktop_LDFLAGS) -desktopctl_OBJS = desktopctl.o +desktopctl_OBJS = $(OBJDIR)desktopctl.o desktopctl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) desktopctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -desktopctl: $(desktopctl_OBJS) - $(CC) -o desktopctl $(desktopctl_OBJS) $(desktopctl_LDFLAGS) +$(OBJDIR)desktopctl: $(desktopctl_OBJS) + $(CC) -o $(OBJDIR)desktopctl $(desktopctl_OBJS) $(desktopctl_LDFLAGS) -move_OBJS = move.o +move_OBJS = $(OBJDIR)move.o move_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) move_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -move: $(move_OBJS) - $(CC) -o move $(move_OBJS) $(move_LDFLAGS) +$(OBJDIR)move: $(move_OBJS) + $(CC) -o $(OBJDIR)move $(move_OBJS) $(move_LDFLAGS) -open_OBJS = open.o +open_OBJS = $(OBJDIR)open.o open_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) open_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -open: $(open_OBJS) - $(CC) -o open $(open_OBJS) $(open_LDFLAGS) +$(OBJDIR)open: $(open_OBJS) + $(CC) -o $(OBJDIR)open $(open_OBJS) $(open_LDFLAGS) -properties_OBJS = properties.o +properties_OBJS = $(OBJDIR)properties.o properties_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) properties_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L . -Wl,-rpath,$(LIBDIR) -lBrowser -properties: $(properties_OBJS) libBrowser.a - $(CC) -o properties $(properties_OBJS) $(properties_LDFLAGS) +$(OBJDIR)properties: $(properties_OBJS) libBrowser.a + $(CC) -o $(OBJDIR)properties $(properties_OBJS) $(properties_LDFLAGS) -view_OBJS = view.o +view_OBJS = $(OBJDIR)view.o view_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) view_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -view: $(view_OBJS) - $(CC) -o view $(view_OBJS) $(view_LDFLAGS) +$(OBJDIR)view: $(view_OBJS) + $(CC) -o $(OBJDIR)view $(view_OBJS) $(view_LDFLAGS) -vfs.o: vfs.c - $(CC) $(libBrowser_CFLAGS) -c vfs.c +$(OBJDIR)vfs.o: vfs.c + $(CC) $(libBrowser_CFLAGS) -o $(OBJDIR)vfs.o -c vfs.c -browser.o: browser.c callbacks.h common.c browser.h ../config.h - $(CC) -D PREFIX=\"$(PREFIX)\" $(browser_CFLAGS) -c browser.c +$(OBJDIR)browser.o: browser.c callbacks.h common.c browser.h ../config.h + $(CC) -D PREFIX=\"$(PREFIX)\" $(browser_CFLAGS) -o $(OBJDIR)browser.o -c browser.c -callbacks.o: callbacks.c browser.h callbacks.h common.c ../config.h - $(CC) $(browser_CFLAGS) -c callbacks.c +$(OBJDIR)callbacks.o: callbacks.c browser.h callbacks.h common.c ../config.h + $(CC) $(browser_CFLAGS) -o $(OBJDIR)callbacks.o -c callbacks.c -main.o: main.c browser.h - $(CC) $(browser_CFLAGS) -c main.c +$(OBJDIR)main.o: main.c browser.h + $(CC) $(browser_CFLAGS) -o $(OBJDIR)main.o -c main.c -copy.o: copy.c - $(CC) $(copy_CFLAGS) -c copy.c +$(OBJDIR)copy.o: copy.c + $(CC) $(copy_CFLAGS) -o $(OBJDIR)copy.o -c copy.c -delete.o: delete.c - $(CC) $(delete_CFLAGS) -c delete.c +$(OBJDIR)delete.o: delete.c + $(CC) $(delete_CFLAGS) -o $(OBJDIR)delete.o -c delete.c -desktop.o: desktop.c desktopicon.h desktop.h common.c ../config.h - $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -c desktop.c +$(OBJDIR)desktop.o: desktop.c desktopicon.h desktop.h common.c ../config.h + $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -o $(OBJDIR)desktop.o -c desktop.c -desktopicon.o: desktopicon.c desktop.h desktopicon.h ../config.h - $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -c desktopicon.c +$(OBJDIR)desktopicon.o: desktopicon.c desktop.h desktopicon.h ../config.h + $(CC) -D PREFIX=\"$(PREFIX)\" $(desktop_CFLAGS) -o $(OBJDIR)desktopicon.o -c desktopicon.c -desktopctl.o: desktopctl.c desktop.h ../config.h - $(CC) $(desktopctl_CFLAGS) -c desktopctl.c +$(OBJDIR)desktopctl.o: desktopctl.c desktop.h ../config.h + $(CC) $(desktopctl_CFLAGS) -o $(OBJDIR)desktopctl.o -c desktopctl.c -move.o: move.c - $(CC) $(move_CFLAGS) -c move.c +$(OBJDIR)move.o: move.c + $(CC) $(move_CFLAGS) -o $(OBJDIR)move.o -c move.c -open.o: open.c - $(CC) $(open_CFLAGS) -c open.c +$(OBJDIR)open.o: open.c + $(CC) $(open_CFLAGS) -o $(OBJDIR)open.o -c open.c -properties.o: properties.c ../include/Browser.h browser.h common.c - $(CC) -D PREFIX=\"$(PREFIX)\" $(properties_CFLAGS) -c properties.c +$(OBJDIR)properties.o: properties.c ../include/Browser.h browser.h common.c + $(CC) -D PREFIX=\"$(PREFIX)\" $(properties_CFLAGS) -o $(OBJDIR)properties.o -c properties.c -view.o: view.c - $(CC) $(view_CFLAGS) -c view.c +$(OBJDIR)view.o: view.c + $(CC) $(view_CFLAGS) -o $(OBJDIR)view.o -c view.c clean: $(RM) -- $(libBrowser_OBJS) $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(desktop_OBJS) $(desktopctl_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(view_OBJS) @@ -144,28 +145,28 @@ distclean: clean install: $(TARGETS) $(MKDIR) $(DESTDIR)$(LIBDIR) - $(INSTALL) -m 0644 libBrowser.a $(DESTDIR)$(LIBDIR)/libBrowser.a - $(INSTALL) -m 0755 libBrowser.so.0.0 $(DESTDIR)$(LIBDIR)/libBrowser.so.0.0 + $(INSTALL) -m 0644 $(OBJDIR)libBrowser.a $(DESTDIR)$(LIBDIR)/libBrowser.a + $(INSTALL) -m 0755 $(OBJDIR)libBrowser.so.0.0 $(DESTDIR)$(LIBDIR)/libBrowser.so.0.0 $(LN) -s -- libBrowser.so.0.0 $(DESTDIR)$(LIBDIR)/libBrowser.so.0 $(LN) -s -- libBrowser.so.0.0 $(DESTDIR)$(LIBDIR)/libBrowser.so $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 browser $(DESTDIR)$(BINDIR)/browser + $(INSTALL) -m 0755 $(OBJDIR)browser $(DESTDIR)$(BINDIR)/browser $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 copy $(DESTDIR)$(BINDIR)/copy + $(INSTALL) -m 0755 $(OBJDIR)copy $(DESTDIR)$(BINDIR)/copy $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 delete $(DESTDIR)$(BINDIR)/delete + $(INSTALL) -m 0755 $(OBJDIR)delete $(DESTDIR)$(BINDIR)/delete $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 desktop $(DESTDIR)$(BINDIR)/desktop + $(INSTALL) -m 0755 $(OBJDIR)desktop $(DESTDIR)$(BINDIR)/desktop $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 desktopctl $(DESTDIR)$(BINDIR)/desktopctl + $(INSTALL) -m 0755 $(OBJDIR)desktopctl $(DESTDIR)$(BINDIR)/desktopctl $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 move $(DESTDIR)$(BINDIR)/move + $(INSTALL) -m 0755 $(OBJDIR)move $(DESTDIR)$(BINDIR)/move $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 open $(DESTDIR)$(BINDIR)/open + $(INSTALL) -m 0755 $(OBJDIR)open $(DESTDIR)$(BINDIR)/open $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 properties $(DESTDIR)$(BINDIR)/properties + $(INSTALL) -m 0755 $(OBJDIR)properties $(DESTDIR)$(BINDIR)/properties $(MKDIR) $(DESTDIR)$(BINDIR) - $(INSTALL) -m 0755 view $(DESTDIR)$(BINDIR)/view + $(INSTALL) -m 0755 $(OBJDIR)view $(DESTDIR)$(BINDIR)/view uninstall: $(RM) -- $(DESTDIR)$(LIBDIR)/libBrowser.a diff --git a/src/plugins/Makefile b/src/plugins/Makefile index 881418e..61ae15e 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -1,4 +1,5 @@ -TARGETS = backup.so cvs.so dirtree.so favorites.so git.so make.so preview.so properties.so selection.so subversion.so template.so trash.so volumes.so +TARGETS = $(OBJDIR)backup.so $(OBJDIR)cvs.so $(OBJDIR)dirtree.so $(OBJDIR)favorites.so $(OBJDIR)git.so $(OBJDIR)make.so $(OBJDIR)preview.so $(OBJDIR)properties.so $(OBJDIR)selection.so $(OBJDIR)subversion.so $(OBJDIR)template.so $(OBJDIR)trash.so $(OBJDIR)volumes.so +OBJDIR = PREFIX = /usr/local DESTDIR = LIBDIR = $(PREFIX)/lib @@ -19,135 +20,135 @@ INSTALL = install all: $(TARGETS) -backup_OBJS = backup.o +backup_OBJS = $(OBJDIR)backup.o backup_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) backup_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -backup.so: $(backup_OBJS) - $(CCSHARED) -o backup.so $(backup_OBJS) $(backup_LDFLAGS) +$(OBJDIR)backup.so: $(backup_OBJS) + $(CCSHARED) -o $(OBJDIR)backup.so $(backup_OBJS) $(backup_LDFLAGS) -cvs_OBJS = cvs.o +cvs_OBJS = $(OBJDIR)cvs.o cvs_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) cvs_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -cvs.so: $(cvs_OBJS) - $(CCSHARED) -o cvs.so $(cvs_OBJS) $(cvs_LDFLAGS) +$(OBJDIR)cvs.so: $(cvs_OBJS) + $(CCSHARED) -o $(OBJDIR)cvs.so $(cvs_OBJS) $(cvs_LDFLAGS) -dirtree_OBJS = dirtree.o +dirtree_OBJS = $(OBJDIR)dirtree.o dirtree_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) dirtree_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L .. -Wl,-rpath,$(LIBDIR) -lBrowser -dirtree.so: $(dirtree_OBJS) - $(CCSHARED) -o dirtree.so $(dirtree_OBJS) $(dirtree_LDFLAGS) +$(OBJDIR)dirtree.so: $(dirtree_OBJS) + $(CCSHARED) -o $(OBJDIR)dirtree.so $(dirtree_OBJS) $(dirtree_LDFLAGS) -favorites_OBJS = favorites.o +favorites_OBJS = $(OBJDIR)favorites.o favorites_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) favorites_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -favorites.so: $(favorites_OBJS) - $(CCSHARED) -o favorites.so $(favorites_OBJS) $(favorites_LDFLAGS) +$(OBJDIR)favorites.so: $(favorites_OBJS) + $(CCSHARED) -o $(OBJDIR)favorites.so $(favorites_OBJS) $(favorites_LDFLAGS) -git_OBJS = git.o +git_OBJS = $(OBJDIR)git.o git_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) git_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -git.so: $(git_OBJS) - $(CCSHARED) -o git.so $(git_OBJS) $(git_LDFLAGS) +$(OBJDIR)git.so: $(git_OBJS) + $(CCSHARED) -o $(OBJDIR)git.so $(git_OBJS) $(git_LDFLAGS) -make_OBJS = make.o +make_OBJS = $(OBJDIR)make.o make_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) make_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -make.so: $(make_OBJS) - $(CCSHARED) -o make.so $(make_OBJS) $(make_LDFLAGS) +$(OBJDIR)make.so: $(make_OBJS) + $(CCSHARED) -o $(OBJDIR)make.so $(make_OBJS) $(make_LDFLAGS) -preview_OBJS = preview.o +preview_OBJS = $(OBJDIR)preview.o preview_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) preview_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -preview.so: $(preview_OBJS) - $(CCSHARED) -o preview.so $(preview_OBJS) $(preview_LDFLAGS) +$(OBJDIR)preview.so: $(preview_OBJS) + $(CCSHARED) -o $(OBJDIR)preview.so $(preview_OBJS) $(preview_LDFLAGS) -properties_OBJS = properties.o +properties_OBJS = $(OBJDIR)properties.o properties_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) properties_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -properties.so: $(properties_OBJS) - $(CCSHARED) -o properties.so $(properties_OBJS) $(properties_LDFLAGS) +$(OBJDIR)properties.so: $(properties_OBJS) + $(CCSHARED) -o $(OBJDIR)properties.so $(properties_OBJS) $(properties_LDFLAGS) -selection_OBJS = selection.o +selection_OBJS = $(OBJDIR)selection.o selection_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) selection_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -selection.so: $(selection_OBJS) - $(CCSHARED) -o selection.so $(selection_OBJS) $(selection_LDFLAGS) +$(OBJDIR)selection.so: $(selection_OBJS) + $(CCSHARED) -o $(OBJDIR)selection.so $(selection_OBJS) $(selection_LDFLAGS) -subversion_OBJS = subversion.o +subversion_OBJS = $(OBJDIR)subversion.o subversion_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) subversion_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -subversion.so: $(subversion_OBJS) - $(CCSHARED) -o subversion.so $(subversion_OBJS) $(subversion_LDFLAGS) +$(OBJDIR)subversion.so: $(subversion_OBJS) + $(CCSHARED) -o $(OBJDIR)subversion.so $(subversion_OBJS) $(subversion_LDFLAGS) -template_OBJS = template.o +template_OBJS = $(OBJDIR)template.o template_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) template_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -template.so: $(template_OBJS) - $(CCSHARED) -o template.so $(template_OBJS) $(template_LDFLAGS) +$(OBJDIR)template.so: $(template_OBJS) + $(CCSHARED) -o $(OBJDIR)template.so $(template_OBJS) $(template_LDFLAGS) -trash_OBJS = trash.o +trash_OBJS = $(OBJDIR)trash.o trash_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) trash_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -trash.so: $(trash_OBJS) - $(CCSHARED) -o trash.so $(trash_OBJS) $(trash_LDFLAGS) +$(OBJDIR)trash.so: $(trash_OBJS) + $(CCSHARED) -o $(OBJDIR)trash.so $(trash_OBJS) $(trash_LDFLAGS) -volumes_OBJS = volumes.o +volumes_OBJS = $(OBJDIR)volumes.o volumes_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) volumes_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -volumes.so: $(volumes_OBJS) - $(CCSHARED) -o volumes.so $(volumes_OBJS) $(volumes_LDFLAGS) +$(OBJDIR)volumes.so: $(volumes_OBJS) + $(CCSHARED) -o $(OBJDIR)volumes.so $(volumes_OBJS) $(volumes_LDFLAGS) -backup.o: backup.c trash.c ../../include/Browser.h - $(CC) $(backup_CFLAGS) -c backup.c +$(OBJDIR)backup.o: backup.c trash.c ../../include/Browser.h + $(CC) $(backup_CFLAGS) -o $(OBJDIR)backup.o -c backup.c -cvs.o: cvs.c common.c ../../include/Browser.h - $(CC) $(cvs_CFLAGS) -c cvs.c +$(OBJDIR)cvs.o: cvs.c common.c ../../include/Browser.h + $(CC) $(cvs_CFLAGS) -o $(OBJDIR)cvs.o -c cvs.c -dirtree.o: dirtree.c ../../include/Browser.h - $(CC) $(dirtree_CFLAGS) -c dirtree.c +$(OBJDIR)dirtree.o: dirtree.c ../../include/Browser.h + $(CC) $(dirtree_CFLAGS) -o $(OBJDIR)dirtree.o -c dirtree.c -favorites.o: favorites.c ../../include/Browser.h - $(CC) $(favorites_CFLAGS) -c favorites.c +$(OBJDIR)favorites.o: favorites.c ../../include/Browser.h + $(CC) $(favorites_CFLAGS) -o $(OBJDIR)favorites.o -c favorites.c -git.o: git.c common.c ../../include/Browser.h - $(CC) $(git_CFLAGS) -c git.c +$(OBJDIR)git.o: git.c common.c ../../include/Browser.h + $(CC) $(git_CFLAGS) -o $(OBJDIR)git.o -c git.c -make.o: make.c common.c ../../include/Browser.h - $(CC) $(make_CFLAGS) -c make.c +$(OBJDIR)make.o: make.c common.c ../../include/Browser.h + $(CC) $(make_CFLAGS) -o $(OBJDIR)make.o -c make.c -preview.o: preview.c ../../include/Browser.h - $(CC) $(preview_CFLAGS) -c preview.c +$(OBJDIR)preview.o: preview.c ../../include/Browser.h + $(CC) $(preview_CFLAGS) -o $(OBJDIR)preview.o -c preview.c -properties.o: properties.c ../../include/Browser.h - $(CC) $(properties_CFLAGS) -c properties.c +$(OBJDIR)properties.o: properties.c ../../include/Browser.h + $(CC) $(properties_CFLAGS) -o $(OBJDIR)properties.o -c properties.c -selection.o: selection.c ../../include/Browser.h - $(CC) $(selection_CFLAGS) -c selection.c +$(OBJDIR)selection.o: selection.c ../../include/Browser.h + $(CC) $(selection_CFLAGS) -o $(OBJDIR)selection.o -c selection.c -subversion.o: subversion.c common.c ../../include/Browser.h - $(CC) $(subversion_CFLAGS) -c subversion.c +$(OBJDIR)subversion.o: subversion.c common.c ../../include/Browser.h + $(CC) $(subversion_CFLAGS) -o $(OBJDIR)subversion.o -c subversion.c -template.o: template.c ../../include/Browser.h - $(CC) $(template_CFLAGS) -c template.c +$(OBJDIR)template.o: template.c ../../include/Browser.h + $(CC) $(template_CFLAGS) -o $(OBJDIR)template.o -c template.c -trash.o: trash.c ../../include/Browser.h - $(CC) $(trash_CFLAGS) -c trash.c +$(OBJDIR)trash.o: trash.c ../../include/Browser.h + $(CC) $(trash_CFLAGS) -o $(OBJDIR)trash.o -c trash.c -volumes.o: volumes.c ../../include/Browser.h - $(CC) $(volumes_CFLAGS) -c volumes.c +$(OBJDIR)volumes.o: volumes.c ../../include/Browser.h + $(CC) $(volumes_CFLAGS) -o $(OBJDIR)volumes.o -c volumes.c clean: $(RM) -- $(backup_OBJS) $(cvs_OBJS) $(dirtree_OBJS) $(favorites_OBJS) $(git_OBJS) $(make_OBJS) $(preview_OBJS) $(properties_OBJS) $(selection_OBJS) $(subversion_OBJS) $(template_OBJS) $(trash_OBJS) $(volumes_OBJS) @@ -157,27 +158,27 @@ distclean: clean install: $(TARGETS) $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 cvs.so $(DESTDIR)$(LIBDIR)/Browser/plugins/cvs.so + $(INSTALL) -m 0755 $(OBJDIR)cvs.so $(DESTDIR)$(LIBDIR)/Browser/plugins/cvs.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 dirtree.so $(DESTDIR)$(LIBDIR)/Browser/plugins/dirtree.so + $(INSTALL) -m 0755 $(OBJDIR)dirtree.so $(DESTDIR)$(LIBDIR)/Browser/plugins/dirtree.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 favorites.so $(DESTDIR)$(LIBDIR)/Browser/plugins/favorites.so + $(INSTALL) -m 0755 $(OBJDIR)favorites.so $(DESTDIR)$(LIBDIR)/Browser/plugins/favorites.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 git.so $(DESTDIR)$(LIBDIR)/Browser/plugins/git.so + $(INSTALL) -m 0755 $(OBJDIR)git.so $(DESTDIR)$(LIBDIR)/Browser/plugins/git.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 make.so $(DESTDIR)$(LIBDIR)/Browser/plugins/make.so + $(INSTALL) -m 0755 $(OBJDIR)make.so $(DESTDIR)$(LIBDIR)/Browser/plugins/make.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 preview.so $(DESTDIR)$(LIBDIR)/Browser/plugins/preview.so + $(INSTALL) -m 0755 $(OBJDIR)preview.so $(DESTDIR)$(LIBDIR)/Browser/plugins/preview.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 properties.so $(DESTDIR)$(LIBDIR)/Browser/plugins/properties.so + $(INSTALL) -m 0755 $(OBJDIR)properties.so $(DESTDIR)$(LIBDIR)/Browser/plugins/properties.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 selection.so $(DESTDIR)$(LIBDIR)/Browser/plugins/selection.so + $(INSTALL) -m 0755 $(OBJDIR)selection.so $(DESTDIR)$(LIBDIR)/Browser/plugins/selection.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 subversion.so $(DESTDIR)$(LIBDIR)/Browser/plugins/subversion.so + $(INSTALL) -m 0755 $(OBJDIR)subversion.so $(DESTDIR)$(LIBDIR)/Browser/plugins/subversion.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 trash.so $(DESTDIR)$(LIBDIR)/Browser/plugins/trash.so + $(INSTALL) -m 0755 $(OBJDIR)trash.so $(DESTDIR)$(LIBDIR)/Browser/plugins/trash.so $(MKDIR) $(DESTDIR)$(LIBDIR)/Browser/plugins - $(INSTALL) -m 0644 volumes.so $(DESTDIR)$(LIBDIR)/Browser/plugins/volumes.so + $(INSTALL) -m 0755 $(OBJDIR)volumes.so $(DESTDIR)$(LIBDIR)/Browser/plugins/volumes.so uninstall: $(RM) -- $(DESTDIR)$(LIBDIR)/Browser/plugins/cvs.so diff --git a/tests/Makefile b/tests/Makefile index 565f0a0..903e49f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,5 @@ -TARGETS = plugins tests.log +TARGETS = $(OBJDIR)plugins $(OBJDIR)tests.log +OBJDIR = PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin @@ -17,18 +18,18 @@ INSTALL = install all: $(TARGETS) -plugins_OBJS = plugins.o +plugins_OBJS = $(OBJDIR)plugins.o plugins_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) plugins_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -plugins: $(plugins_OBJS) - $(CC) -o plugins $(plugins_OBJS) $(plugins_LDFLAGS) +$(OBJDIR)plugins: $(plugins_OBJS) + $(CC) -o $(OBJDIR)plugins $(plugins_OBJS) $(plugins_LDFLAGS) -tests.log: plugins tests.sh - ./tests.sh -P "$(PREFIX)" -- "tests.log" +$(OBJDIR)tests.log: plugins tests.sh + ./tests.sh -P "$(PREFIX)" -- "$(OBJDIR)tests.log" -plugins.o: plugins.c - $(CC) $(plugins_CFLAGS) -c plugins.c +$(OBJDIR)plugins.o: plugins.c + $(CC) $(plugins_CFLAGS) -o $(OBJDIR)plugins.o -c plugins.c clean: $(RM) -- $(plugins_OBJS) $(tests.log_OBJS) diff --git a/tools/Makefile b/tools/Makefile index dc25d87..b3e90f4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,5 @@ -TARGETS = dirtree iconlist +TARGETS = $(OBJDIR)dirtree $(OBJDIR)iconlist +OBJDIR = PREFIX = /usr/local DESTDIR = BINDIR = $(PREFIX)/bin @@ -17,25 +18,25 @@ INSTALL = install all: $(TARGETS) -dirtree_OBJS = dirtree.o +dirtree_OBJS = $(OBJDIR)dirtree.o dirtree_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) dirtree_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -dirtree: $(dirtree_OBJS) - $(CC) -o dirtree $(dirtree_OBJS) $(dirtree_LDFLAGS) +$(OBJDIR)dirtree: $(dirtree_OBJS) + $(CC) -o $(OBJDIR)dirtree $(dirtree_OBJS) $(dirtree_LDFLAGS) -iconlist_OBJS = iconlist.o +iconlist_OBJS = $(OBJDIR)iconlist.o iconlist_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) iconlist_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -iconlist: $(iconlist_OBJS) - $(CC) -o iconlist $(iconlist_OBJS) $(iconlist_LDFLAGS) +$(OBJDIR)iconlist: $(iconlist_OBJS) + $(CC) -o $(OBJDIR)iconlist $(iconlist_OBJS) $(iconlist_LDFLAGS) -dirtree.o: dirtree.c - $(CC) $(dirtree_CFLAGS) -c dirtree.c +$(OBJDIR)dirtree.o: dirtree.c + $(CC) $(dirtree_CFLAGS) -o $(OBJDIR)dirtree.o -c dirtree.c -iconlist.o: iconlist.c - $(CC) $(iconlist_CFLAGS) -c iconlist.c +$(OBJDIR)iconlist.o: iconlist.c + $(CC) $(iconlist_CFLAGS) -o $(OBJDIR)iconlist.o -c iconlist.c clean: $(RM) -- $(dirtree_OBJS) $(iconlist_OBJS)