From 7d9507c4f801a093364a8db59ff7d59d8d3260b7 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 12 Jul 2015 22:16:01 +0200 Subject: [PATCH] No longer store Makefiles in the source tree --- Makefile | 98 -------------------------------------- data/Makefile | 22 --------- doc/Makefile | 35 -------------- include/Makefile | 48 ------------------- include/Presenter/Makefile | 27 ----------- po/Makefile | 33 ------------- src/Makefile | 79 ------------------------------ src/slides/Makefile | 59 ----------------------- 8 files changed, 401 deletions(-) delete mode 100644 Makefile delete mode 100644 data/Makefile delete mode 100644 doc/Makefile delete mode 100644 include/Makefile delete mode 100644 include/Presenter/Makefile delete mode 100644 po/Makefile delete mode 100644 src/Makefile delete mode 100644 src/slides/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 0ff5f1e..0000000 --- a/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -PACKAGE = Presenter -VERSION = 0.0.0 -SUBDIRS = data doc include po src -RM = rm -f -LN = ln -f -TAR = tar -MKDIR = mkdir -m 0755 -p - - -all: subdirs - -subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ - else $(MAKE); fi) || exit; done - -clean: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \ - else $(MAKE) clean; fi) || exit; done - -distclean: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \ - else $(MAKE) distclean; fi) || exit; done - -dist: - $(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/deforaos-presenter.desktop \ - $(PACKAGE)-$(VERSION)/data/project.conf \ - $(PACKAGE)-$(VERSION)/doc/Makefile \ - $(PACKAGE)-$(VERSION)/doc/docbook.sh \ - $(PACKAGE)-$(VERSION)/doc/manual.css.xml \ - $(PACKAGE)-$(VERSION)/doc/presenter.css.xml \ - $(PACKAGE)-$(VERSION)/doc/presenter.xml \ - $(PACKAGE)-$(VERSION)/doc/project.conf \ - $(PACKAGE)-$(VERSION)/include/Presenter.h \ - $(PACKAGE)-$(VERSION)/include/Makefile \ - $(PACKAGE)-$(VERSION)/include/project.conf \ - $(PACKAGE)-$(VERSION)/include/Presenter/presenter.h \ - $(PACKAGE)-$(VERSION)/include/Presenter/slide.h \ - $(PACKAGE)-$(VERSION)/include/Presenter/Makefile \ - $(PACKAGE)-$(VERSION)/include/Presenter/project.conf \ - $(PACKAGE)-$(VERSION)/po/Makefile \ - $(PACKAGE)-$(VERSION)/po/gettext.sh \ - $(PACKAGE)-$(VERSION)/po/POTFILES \ - $(PACKAGE)-$(VERSION)/po/fr.po \ - $(PACKAGE)-$(VERSION)/po/project.conf \ - $(PACKAGE)-$(VERSION)/src/document.c \ - $(PACKAGE)-$(VERSION)/src/presenter.c \ - $(PACKAGE)-$(VERSION)/src/slide.c \ - $(PACKAGE)-$(VERSION)/src/main.c \ - $(PACKAGE)-$(VERSION)/src/Makefile \ - $(PACKAGE)-$(VERSION)/src/document.h \ - $(PACKAGE)-$(VERSION)/src/presenter.h \ - $(PACKAGE)-$(VERSION)/src/slide.h \ - $(PACKAGE)-$(VERSION)/src/project.conf \ - $(PACKAGE)-$(VERSION)/src/slides/embed.c \ - $(PACKAGE)-$(VERSION)/src/slides/title.c \ - $(PACKAGE)-$(VERSION)/src/slides/Makefile \ - $(PACKAGE)-$(VERSION)/src/slides/project.conf \ - $(PACKAGE)-$(VERSION)/Makefile \ - $(PACKAGE)-$(VERSION)/config.h \ - $(PACKAGE)-$(VERSION)/config.sh \ - $(PACKAGE)-$(VERSION)/project.conf - $(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" && \ - if [ -n "$(OBJDIR)" ]; then \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \ - else $(MAKE) install; fi) || exit; done - -uninstall: - @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 diff --git a/data/Makefile b/data/Makefile deleted file mode 100644 index b75c4c6..0000000 --- a/data/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -OBJDIR = -PREFIX = /usr/local -DESTDIR = -MKDIR = mkdir -m 0755 -p -INSTALL = install -RM = rm -f - - -all: - -clean: - -distclean: clean - -install: - $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications - $(INSTALL) -m 0644 deforaos-presenter.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-presenter.desktop - -uninstall: - $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-presenter.desktop - -.PHONY: all clean distclean install uninstall diff --git a/doc/Makefile b/doc/Makefile deleted file mode 100644 index 5db1699..0000000 --- a/doc/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -TARGETS = $(OBJDIR)presenter.1 $(OBJDIR)presenter.html -OBJDIR = -PREFIX = /usr/local -DESTDIR = -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install - - -all: $(TARGETS) - -$(OBJDIR)presenter.1: presenter.xml - ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)presenter.1" - -$(OBJDIR)presenter.html: manual.css.xml presenter.css.xml presenter.xml - ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)presenter.html" - -clean: - $(RM) -- $(presenter.1_OBJS) $(presenter.html_OBJS) - ./docbook.sh -c -P "$(PREFIX)" -- "presenter.1" - ./docbook.sh -c -P "$(PREFIX)" -- "presenter.html" - -distclean: clean - $(RM) -- $(TARGETS) - -install: $(TARGETS) - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)presenter.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)presenter.html" - -uninstall: - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "presenter.1" - ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "presenter.html" - -.PHONY: all clean distclean install uninstall diff --git a/include/Makefile b/include/Makefile deleted file mode 100644 index 4bd746d..0000000 --- a/include/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -SUBDIRS = Presenter -OBJDIR = -PREFIX = /usr/local -DESTDIR = -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install -INCLUDEDIR= $(PREFIX)/include - - -all: subdirs - -subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ - else $(MAKE); fi) || exit; done - -clean: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \ - else $(MAKE) clean; fi) || exit; done - -distclean: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \ - else $(MAKE) distclean; fi) || exit; done - -install: - @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 - $(INSTALL) -m 0644 Presenter.h $(DESTDIR)$(PREFIX)/include/Desktop/Presenter.h - -uninstall: - @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 - -.PHONY: all subdirs clean distclean install uninstall diff --git a/include/Presenter/Makefile b/include/Presenter/Makefile deleted file mode 100644 index 15090f0..0000000 --- a/include/Presenter/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -OBJDIR = -PREFIX = /usr/local -DESTDIR = -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install -INCLUDEDIR= $(PREFIX)/include - - -all: - -clean: - -distclean: clean - -install: - $(MKDIR) $(DESTDIR)$(PREFIX)/include/Desktop/Presenter - $(INSTALL) -m 0644 presenter.h $(DESTDIR)$(PREFIX)/include/Desktop/Presenter/presenter.h - $(MKDIR) $(DESTDIR)$(PREFIX)/include/Desktop/Presenter - $(INSTALL) -m 0644 slide.h $(DESTDIR)$(PREFIX)/include/Desktop/Presenter/slide.h - -uninstall: - $(RM) -- $(DESTDIR)$(PREFIX)/include/Desktop/Presenter/presenter.h - $(RM) -- $(DESTDIR)$(PREFIX)/include/Desktop/Presenter/slide.h - -.PHONY: all clean distclean install uninstall diff --git a/po/Makefile b/po/Makefile deleted file mode 100644 index 6557678..0000000 --- a/po/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -TARGETS = $(OBJDIR)Presenter.pot $(OBJDIR)fr.mo -OBJDIR = -PREFIX = /usr/local -DESTDIR = -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install - - -all: $(TARGETS) - -$(OBJDIR)Presenter.pot: POTFILES - ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)Presenter.pot" - -$(OBJDIR)fr.mo: $(OBJDIR)Presenter.pot fr.po - ./gettext.sh -P "$(PREFIX)" -- "$(OBJDIR)fr.mo" - -clean: - $(RM) -- $(Presenter.pot_OBJS) $(fr.mo_OBJS) - ./gettext.sh -c -P "$(PREFIX)" -- "Presenter.pot" - ./gettext.sh -c -P "$(PREFIX)" -- "fr.mo" - -distclean: clean - $(RM) -- $(TARGETS) - -install: $(TARGETS) - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)fr.mo" - -uninstall: - ./gettext.sh -P "$(DESTDIR)$(PREFIX)" -u -- "fr.mo" - -.PHONY: all clean distclean install uninstall diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index c9fe3ae..0000000 --- a/src/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -SUBDIRS = slides -TARGETS = $(OBJDIR)presenter -OBJDIR = -PREFIX = /usr/local -DESTDIR = -BINDIR = $(PREFIX)/bin -SBINDIR = $(PREFIX)/sbin -CC = cc -CPPFLAGSF= -I ../include -CPPFLAGS= -CFLAGSF = -W `pkg-config --cflags libDesktop` -CFLAGS = -Wall -g -O2 -pedantic -fPIC -fstack-protector -LDFLAGSF= `pkg-config --libs libDesktop` -LDFLAGS = -Wl,-pie -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install - - -all: subdirs $(TARGETS) - -subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && \ - if [ -n "$(OBJDIR)" ]; then \ - ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ - $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ - else $(MAKE); fi) || exit; done - -presenter_OBJS = $(OBJDIR)document.o $(OBJDIR)presenter.o $(OBJDIR)slide.o $(OBJDIR)main.o -presenter_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -presenter_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) - -$(OBJDIR)presenter: $(presenter_OBJS) - $(CC) -o $(OBJDIR)presenter $(presenter_OBJS) $(presenter_LDFLAGS) - -$(OBJDIR)document.o: document.c document.h slide.h ../config.h - $(CC) $(presenter_CFLAGS) -o $(OBJDIR)document.o -c document.c - -$(OBJDIR)presenter.o: presenter.c document.h presenter.h slide.h ../config.h - $(CC) -D PREFIX=\"$(PREFIX)\" $(presenter_CFLAGS) -o $(OBJDIR)presenter.o -c presenter.c - -$(OBJDIR)slide.o: slide.c slide.h ../config.h - $(CC) $(presenter_CFLAGS) -o $(OBJDIR)slide.o -c slide.c - -$(OBJDIR)main.o: main.c presenter.h ../config.h - $(CC) $(presenter_CFLAGS) -o $(OBJDIR)main.o -c main.c - -clean: - @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) - -distclean: - @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) -- $(TARGETS) - -install: $(TARGETS) - @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) - $(INSTALL) -m 0755 $(OBJDIR)presenter $(DESTDIR)$(BINDIR)/presenter - -uninstall: - @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 - -.PHONY: all subdirs clean distclean install uninstall diff --git a/src/slides/Makefile b/src/slides/Makefile deleted file mode 100644 index 7f3c260..0000000 --- a/src/slides/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -TARGETS = $(OBJDIR)embed.so $(OBJDIR)title.so -OBJDIR = -PREFIX = /usr/local -DESTDIR = -LIBDIR = $(PREFIX)/lib -CC = cc -CPPFLAGSF= -I ../../include -CPPFLAGS= -CFLAGSF = -W `pkg-config --cflags libDesktop` -CFLAGS = -Wall -g -O2 -pedantic -fPIC -fstack-protector -LDFLAGSF= -W `pkg-config --libs libDesktop` -AR = ar -RANLIB = ranlib -CCSHARED= $(CC) -shared -RM = rm -f -LN = ln -f -MKDIR = mkdir -m 0755 -p -INSTALL = install - - -all: $(TARGETS) - -embed_OBJS = $(OBJDIR)embed.o -embed_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -embed_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) - -$(OBJDIR)embed.so: $(embed_OBJS) - $(CCSHARED) -o $(OBJDIR)embed.so $(embed_OBJS) $(embed_LDFLAGS) - -title_OBJS = $(OBJDIR)title.o -title_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -title_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) - -$(OBJDIR)title.so: $(title_OBJS) - $(CCSHARED) -o $(OBJDIR)title.so $(title_OBJS) $(title_LDFLAGS) - -$(OBJDIR)embed.o: embed.c - $(CC) $(embed_CFLAGS) -o $(OBJDIR)embed.o -c embed.c - -$(OBJDIR)title.o: title.c - $(CC) $(title_CFLAGS) -o $(OBJDIR)title.o -c title.c - -clean: - $(RM) -- $(embed_OBJS) $(title_OBJS) - -distclean: clean - $(RM) -- $(TARGETS) - -install: $(TARGETS) - $(MKDIR) $(DESTDIR)$(LIBDIR)/Presenter/slides - $(INSTALL) -m 0755 $(OBJDIR)embed.so $(DESTDIR)$(LIBDIR)/Presenter/slides/embed.so - $(MKDIR) $(DESTDIR)$(LIBDIR)/Presenter/slides - $(INSTALL) -m 0755 $(OBJDIR)title.so $(DESTDIR)$(LIBDIR)/Presenter/slides/title.so - -uninstall: - $(RM) -- $(DESTDIR)$(LIBDIR)/Presenter/slides/embed.so - $(RM) -- $(DESTDIR)$(LIBDIR)/Presenter/slides/title.so - -.PHONY: all clean distclean install uninstall