Re-generate the Makefiles
This commit is contained in:
parent
18f0f56724
commit
5edcdea3e1
30
Makefile
30
Makefile
|
@ -17,10 +17,16 @@ subdirs:
|
||||||
else $(MAKE); fi) || exit; done
|
else $(MAKE); fi) || exit; done
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
|
||||||
|
else $(MAKE) clean; fi) || exit; done
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
|
||||||
|
else $(MAKE) distclean; fi) || exit; done
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
$(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION)
|
$(RM) -r -- $(OBJDIR)$(PACKAGE)-$(VERSION)
|
||||||
|
@ -70,17 +76,23 @@ distcheck: dist
|
||||||
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz
|
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz
|
||||||
$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
|
$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
|
||||||
$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
|
$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
|
||||||
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/")
|
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" install
|
||||||
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall)
|
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall
|
||||||
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean)
|
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean
|
||||||
(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist)
|
cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist
|
||||||
$(RM) -r -- $(PACKAGE)-$(VERSION)
|
$(RM) -r -- $(PACKAGE)-$(VERSION)
|
||||||
|
|
||||||
install:
|
install:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
|
||||||
|
else $(MAKE) install; fi) || exit; done
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
|
||||||
|
else $(MAKE) uninstall; fi) || exit; done
|
||||||
|
|
||||||
.PHONY: all subdirs clean distclean dist distcheck install uninstall
|
.PHONY: all subdirs clean distclean dist distcheck install uninstall
|
||||||
|
|
|
@ -19,18 +19,30 @@ subdirs:
|
||||||
else $(MAKE); fi) || exit; done
|
else $(MAKE); fi) || exit; done
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
|
||||||
|
else $(MAKE) clean; fi) || exit; done
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
|
||||||
|
else $(MAKE) distclean; fi) || exit; done
|
||||||
|
|
||||||
install:
|
install:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
|
||||||
|
else $(MAKE) install; fi) || exit; done
|
||||||
$(MKDIR) $(DESTDIR)$(PREFIX)/include/Desktop
|
$(MKDIR) $(DESTDIR)$(PREFIX)/include/Desktop
|
||||||
$(INSTALL) -m 0644 Presenter.h $(DESTDIR)$(PREFIX)/include/Desktop/Presenter.h
|
$(INSTALL) -m 0644 Presenter.h $(DESTDIR)$(PREFIX)/include/Desktop/Presenter.h
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
|
||||||
|
else $(MAKE) uninstall; fi) || exit; done
|
||||||
$(RM) -- $(DESTDIR)$(PREFIX)/include/Desktop/Presenter.h
|
$(RM) -- $(DESTDIR)$(PREFIX)/include/Desktop/Presenter.h
|
||||||
|
|
||||||
.PHONY: all subdirs clean distclean install uninstall
|
.PHONY: all subdirs clean distclean install uninstall
|
||||||
|
|
20
src/Makefile
20
src/Makefile
|
@ -46,21 +46,33 @@ $(OBJDIR)main.o: main.c presenter.h ../config.h
|
||||||
$(CC) $(presenter_CFLAGS) -o $(OBJDIR)main.o -c main.c
|
$(CC) $(presenter_CFLAGS) -o $(OBJDIR)main.o -c main.c
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
|
||||||
|
else $(MAKE) clean; fi) || exit; done
|
||||||
$(RM) -- $(presenter_OBJS)
|
$(RM) -- $(presenter_OBJS)
|
||||||
|
|
||||||
distclean:
|
distclean:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
|
||||||
|
else $(MAKE) distclean; fi) || exit; done
|
||||||
$(RM) -- $(presenter_OBJS)
|
$(RM) -- $(presenter_OBJS)
|
||||||
$(RM) -- $(TARGETS)
|
$(RM) -- $(TARGETS)
|
||||||
|
|
||||||
install: $(TARGETS)
|
install: $(TARGETS)
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
|
||||||
|
else $(MAKE) install; fi) || exit; done
|
||||||
$(MKDIR) $(DESTDIR)$(BINDIR)
|
$(MKDIR) $(DESTDIR)$(BINDIR)
|
||||||
$(INSTALL) -m 0755 $(OBJDIR)presenter $(DESTDIR)$(BINDIR)/presenter
|
$(INSTALL) -m 0755 $(OBJDIR)presenter $(DESTDIR)$(BINDIR)/presenter
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
|
@for i in $(SUBDIRS); do (cd "$$i" && \
|
||||||
|
if [ -n "$(OBJDIR)" ]; then \
|
||||||
|
$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
|
||||||
|
else $(MAKE) uninstall; fi) || exit; done
|
||||||
$(RM) -- $(DESTDIR)$(BINDIR)/presenter
|
$(RM) -- $(DESTDIR)$(BINDIR)/presenter
|
||||||
|
|
||||||
.PHONY: all subdirs clean distclean install uninstall
|
.PHONY: all subdirs clean distclean install uninstall
|
||||||
|
|
Loading…
Reference in New Issue
Block a user