Re-generate the Makefiles
This commit is contained in:
parent
7c6a2d87ad
commit
e99eac6866
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)
|
||||||
|
@ -69,17 +75,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
|
||||||
|
|
20
doc/Makefile
20
doc/Makefile
|
@ -31,7 +31,10 @@ $(OBJDIR)gtkdoc/html.stamp: gtkdoc/CPP-docs.xml $(OBJDIR)gtkdoc/sgml.stamp
|
||||||
./gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp"
|
./gtkdoc.sh -P "$(PREFIX)" -- "$(OBJDIR)gtkdoc/html.stamp"
|
||||||
|
|
||||||
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) -- $(gtkdoc/CPP.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
|
$(RM) -- $(gtkdoc/CPP.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
|
||||||
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/CPP.types"
|
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/CPP.types"
|
||||||
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
|
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
|
||||||
|
@ -39,7 +42,10 @@ clean:
|
||||||
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/html.stamp"
|
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/html.stamp"
|
||||||
|
|
||||||
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) -- $(gtkdoc/CPP.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
|
$(RM) -- $(gtkdoc/CPP.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
|
||||||
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/CPP.types"
|
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/CPP.types"
|
||||||
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
|
./gtkdoc.sh -c -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
|
||||||
|
@ -48,11 +54,17 @@ distclean:
|
||||||
$(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
|
||||||
./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp"
|
./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)gtkdoc/html.stamp"
|
||||||
|
|
||||||
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
|
||||||
./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gtkdoc/html.stamp"
|
./gtkdoc.sh -P "$(DESTDIR)$(PREFIX)" -u -- "gtkdoc/html.stamp"
|
||||||
|
|
||||||
.PHONY: all subdirs clean distclean install uninstall
|
.PHONY: all subdirs clean distclean install uninstall
|
||||||
|
|
|
@ -12,15 +12,27 @@ 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
|
||||||
|
|
||||||
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 install uninstall
|
.PHONY: all subdirs clean distclean install uninstall
|
||||||
|
|
|
@ -31,9 +31,13 @@ $(OBJDIR)libcpp.a: $(libcpp_OBJS)
|
||||||
$(AR) -rc $(OBJDIR)libcpp.a $(libcpp_OBJS)
|
$(AR) -rc $(OBJDIR)libcpp.a $(libcpp_OBJS)
|
||||||
$(RANLIB) $(OBJDIR)libcpp.a
|
$(RANLIB) $(OBJDIR)libcpp.a
|
||||||
|
|
||||||
$(OBJDIR)libcpp.so.0.0 $(OBJDIR)libcpp.so.0 $(OBJDIR)libcpp.so: $(libcpp_OBJS)
|
$(OBJDIR)libcpp.so.0.0: $(libcpp_OBJS)
|
||||||
$(CCSHARED) -o $(OBJDIR)libcpp.so.0.0 -Wl,-soname,libcpp.so.0 $(libcpp_OBJS) $(libcpp_LDFLAGS)
|
$(CCSHARED) -o $(OBJDIR)libcpp.so.0.0 -Wl,-soname,libcpp.so.0 $(libcpp_OBJS) $(libcpp_LDFLAGS)
|
||||||
|
|
||||||
|
$(OBJDIR)libcpp.so.0: $(OBJDIR)libcpp.so.0.0
|
||||||
$(LN) -s -- libcpp.so.0.0 $(OBJDIR)libcpp.so.0
|
$(LN) -s -- libcpp.so.0.0 $(OBJDIR)libcpp.so.0
|
||||||
|
|
||||||
|
$(OBJDIR)libcpp.so: $(OBJDIR)libcpp.so.0.0
|
||||||
$(LN) -s -- libcpp.so.0.0 $(OBJDIR)libcpp.so
|
$(LN) -s -- libcpp.so.0.0 $(OBJDIR)libcpp.so
|
||||||
|
|
||||||
cpp_OBJS = $(OBJDIR)main.o
|
cpp_OBJS = $(OBJDIR)main.o
|
||||||
|
|
Loading…
Reference in New Issue
Block a user