Re-generate the Makefiles
This commit is contained in:
parent
ad58eb0750
commit
80aa2c0078
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)
|
||||||
|
@ -51,17 +57,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
src/Makefile
19
src/Makefile
|
@ -1,4 +1,4 @@
|
||||||
TARGETS = $(OBJDIR)../data/Probe.h $(OBJDIR)Probe $(OBJDIR)DaMon
|
TARGETS = $(OBJDIR)../data/Probe.h $(OBJDIR)Probe$(EXEEXT) $(OBJDIR)DaMon$(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`
|
LDFLAGSF= `pkg-config --libs libApp`
|
||||||
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,15 +27,15 @@ Probe_OBJS = $(OBJDIR)probe.o
|
||||||
Probe_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
Probe_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||||
Probe_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Wl,--export-dynamic
|
Probe_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -Wl,--export-dynamic
|
||||||
|
|
||||||
$(OBJDIR)Probe: $(Probe_OBJS)
|
$(OBJDIR)Probe$(EXEEXT): $(Probe_OBJS)
|
||||||
$(CC) -o $(OBJDIR)Probe $(Probe_OBJS) $(Probe_LDFLAGS)
|
$(CC) -o $(OBJDIR)Probe$(EXEEXT) $(Probe_OBJS) $(Probe_LDFLAGS)
|
||||||
|
|
||||||
DaMon_OBJS = $(OBJDIR)damon.o
|
DaMon_OBJS = $(OBJDIR)damon.o
|
||||||
DaMon_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
DaMon_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||||
DaMon_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
DaMon_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)DaMon: $(DaMon_OBJS)
|
$(OBJDIR)DaMon$(EXEEXT): $(DaMon_OBJS)
|
||||||
$(CC) -o $(OBJDIR)DaMon $(DaMon_OBJS) $(DaMon_LDFLAGS)
|
$(CC) -o $(OBJDIR)DaMon$(EXEEXT) $(DaMon_OBJS) $(DaMon_LDFLAGS)
|
||||||
|
|
||||||
$(OBJDIR)probe.o: probe.c ../data/Probe.h ../config.h
|
$(OBJDIR)probe.o: probe.c ../data/Probe.h ../config.h
|
||||||
$(CC) $(Probe_CFLAGS) -o $(OBJDIR)probe.o -c probe.c
|
$(CC) $(Probe_CFLAGS) -o $(OBJDIR)probe.o -c probe.c
|
||||||
|
@ -51,12 +52,12 @@ distclean: clean
|
||||||
|
|
||||||
install: $(TARGETS)
|
install: $(TARGETS)
|
||||||
$(MKDIR) $(DESTDIR)$(BINDIR)
|
$(MKDIR) $(DESTDIR)$(BINDIR)
|
||||||
$(INSTALL) -m 0755 $(OBJDIR)Probe $(DESTDIR)$(BINDIR)/Probe
|
$(INSTALL) -m 0755 $(OBJDIR)Probe$(EXEEXT) $(DESTDIR)$(BINDIR)/Probe$(EXEEXT)
|
||||||
$(MKDIR) $(DESTDIR)$(BINDIR)
|
$(MKDIR) $(DESTDIR)$(BINDIR)
|
||||||
$(INSTALL) -m 0755 $(OBJDIR)DaMon $(DESTDIR)$(BINDIR)/DaMon
|
$(INSTALL) -m 0755 $(OBJDIR)DaMon$(EXEEXT) $(DESTDIR)$(BINDIR)/DaMon$(EXEEXT)
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
$(RM) -- $(DESTDIR)$(BINDIR)/Probe
|
$(RM) -- $(DESTDIR)$(BINDIR)/Probe$(EXEEXT)
|
||||||
$(RM) -- $(DESTDIR)$(BINDIR)/DaMon
|
$(RM) -- $(DESTDIR)$(BINDIR)/DaMon$(EXEEXT)
|
||||||
|
|
||||||
.PHONY: all clean distclean install uninstall
|
.PHONY: all clean distclean install uninstall
|
||||||
|
|
Loading…
Reference in New Issue
Block a user