Re-generate the Makefiles
This commit is contained in:
parent
7c4955f754
commit
e5fab3ecec
35
Makefile
35
Makefile
|
@ -4,6 +4,7 @@ SUBDIRS = data src
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
LN = ln -f
|
LN = ln -f
|
||||||
TAR = tar
|
TAR = tar
|
||||||
|
TGZEXT = .tar.gz
|
||||||
MKDIR = mkdir -m 0755 -p
|
MKDIR = mkdir -m 0755 -p
|
||||||
|
|
||||||
|
|
||||||
|
@ -17,15 +18,21 @@ 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)
|
||||||
$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
|
$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
|
||||||
@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \
|
@cd $(OBJDIR). && $(TAR) -czvf $(PACKAGE)-$(VERSION)$(TGZEXT) -- \
|
||||||
$(PACKAGE)-$(VERSION)/data/Makefile \
|
$(PACKAGE)-$(VERSION)/data/Makefile \
|
||||||
$(PACKAGE)-$(VERSION)/data/Splasher.interface \
|
$(PACKAGE)-$(VERSION)/data/Splasher.interface \
|
||||||
$(PACKAGE)-$(VERSION)/data/project.conf \
|
$(PACKAGE)-$(VERSION)/data/project.conf \
|
||||||
|
@ -42,20 +49,26 @@ dist:
|
||||||
$(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION)
|
$(RM) -- $(OBJDIR)$(PACKAGE)-$(VERSION)
|
||||||
|
|
||||||
distcheck: dist
|
distcheck: dist
|
||||||
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz
|
$(TAR) -xzvf $(OBJDIR)$(PACKAGE)-$(VERSION)$(TGZEXT)
|
||||||
$(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
|
||||||
|
|
13
src/Makefile
13
src/Makefile
|
@ -1,4 +1,4 @@
|
||||||
TARGETS = $(OBJDIR)../data/Splasher.h $(OBJDIR)Splasher
|
TARGETS = $(OBJDIR)../data/Splasher.h $(OBJDIR)Splasher$(EXEEXT)
|
||||||
OBJDIR =
|
OBJDIR =
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
DESTDIR =
|
DESTDIR =
|
||||||
|
@ -11,6 +11,7 @@ CFLAGSF = -W `pkg-config --cflags libApp`
|
||||||
CFLAGS = -Wall -g -O2 -pedantic
|
CFLAGS = -Wall -g -O2 -pedantic
|
||||||
LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic
|
LDFLAGSF= `pkg-config --libs libApp` -Wl,--export-dynamic
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
|
EXEEXT =
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
LN = ln -f
|
LN = ln -f
|
||||||
MKDIR = mkdir -m 0755 -p
|
MKDIR = mkdir -m 0755 -p
|
||||||
|
@ -26,8 +27,8 @@ Splasher_OBJS = $(OBJDIR)splasher.o $(OBJDIR)main.o
|
||||||
Splasher_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
Splasher_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||||
Splasher_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
Splasher_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)Splasher: $(Splasher_OBJS)
|
$(OBJDIR)Splasher$(EXEEXT): $(Splasher_OBJS)
|
||||||
$(CC) -o $(OBJDIR)Splasher $(Splasher_OBJS) $(Splasher_LDFLAGS)
|
$(CC) -o $(OBJDIR)Splasher$(EXEEXT) $(Splasher_OBJS) $(Splasher_LDFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)splasher.o: splasher.c ../data/Splasher.h
|
$(OBJDIR)splasher.o: splasher.c ../data/Splasher.h
|
||||||
$(CC) $(Splasher_CFLAGS) -o $(OBJDIR)splasher.o -c splasher.c
|
$(CC) $(Splasher_CFLAGS) -o $(OBJDIR)splasher.o -c splasher.c
|
||||||
|
@ -37,16 +38,16 @@ $(OBJDIR)main.o: main.c
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) -- $(../data/Splasher.h_OBJS) $(Splasher_OBJS)
|
$(RM) -- $(../data/Splasher.h_OBJS) $(Splasher_OBJS)
|
||||||
./appbroker.sh -c -P "$(PREFIX)" -- "../data/Splasher.h"
|
./appbroker.sh -c -P "$(PREFIX)" -- "$(OBJDIR)../data/Splasher.h"
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
$(RM) -- $(TARGETS)
|
$(RM) -- $(TARGETS)
|
||||||
|
|
||||||
install: $(TARGETS)
|
install: $(TARGETS)
|
||||||
$(MKDIR) $(DESTDIR)$(BINDIR)
|
$(MKDIR) $(DESTDIR)$(BINDIR)
|
||||||
$(INSTALL) -m 0755 $(OBJDIR)Splasher $(DESTDIR)$(BINDIR)/Splasher
|
$(INSTALL) -m 0755 $(OBJDIR)Splasher$(EXEEXT) $(DESTDIR)$(BINDIR)/Splasher$(EXEEXT)
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
$(RM) -- $(DESTDIR)$(BINDIR)/Splasher
|
$(RM) -- $(DESTDIR)$(BINDIR)/Splasher$(EXEEXT)
|
||||||
|
|
||||||
.PHONY: all clean distclean install uninstall
|
.PHONY: all clean distclean install uninstall
|
||||||
|
|
Loading…
Reference in New Issue
Block a user