This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
setup: simplify SUBDIRS
- From: "Yaakov (Cygwin/X)" <yselkowitz at users dot sourceforge dot net>
- To: cygwin-apps <cygwin-apps at cygwin dot com>
- Date: Tue, 10 Aug 2010 01:57:56 -0500
- Subject: setup: simplify SUBDIRS
Right now, "make clean" (or the other *clean targets) does not clean in
libgetopt++. Unless there is something I'm not aware of, libgetopt++
can be handled like any other SUBDIRS, so that all targets are passed
down to it as well. Patch attached.
Yaakov
2010-08-10 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
* Makefile.am: Treat libgetopt++ as full-fledged SUBDIRS.
(setup_LDADD): Always link against included libgetopt++.
Index: Makefile.am
===================================================================
RCS file: /cvs/cygwin-apps/setup/Makefile.am,v
retrieving revision 2.82
diff -u -r2.82 Makefile.am
--- Makefile.am 29 Jul 2010 13:09:54 -0000 2.82
+++ Makefile.am 10 Aug 2010 06:46:57 -0000
@@ -15,9 +15,7 @@
#
# Makefile for Cygwin installer
-INST_SUBDIRS:=@subdirs@
-DIST_SUBDIRS:=${INST_SUBDIRS} tests
-SUBDIRS:=tests
+SUBDIRS := @subdirs@ tests
## DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
@@ -63,8 +61,7 @@
# knows about that already)
BUILT_SOURCES = \
setup_version.c \
- iniparse.h \
- ${INST_SUBDIRS}
+ iniparse.h
CLEANFILES = setup_version.c
@@ -115,7 +112,7 @@
setup_LDADD = \
libinilex.a \
- -Linst/lib -lgetopt++ -lgcrypt -lgpg-error \
+ libgetopt++/libgetopt++.la -lgcrypt -lgpg-error \
-lshlwapi -lcomctl32 -lole32 -lwsock32 -lnetapi32 -luuid -llzma -lbz2 -lz
setup_LDFLAGS = -mwindows -Wl,-static -static-libtool-libs
setup_SOURCES = \
@@ -308,6 +305,3 @@
sort | tar -T - -cjf ${CURDIR}/$$ver-src.tar.bz2;\
echo $$ver-src.tar.bz2; exec rm -f $$ver
-.PHONY: ${INST_SUBDIRS}
-${INST_SUBDIRS}:
- ${MAKE} -C $@ install