From: Christopher Faylor <me@cgf.cx>
Date: Sun, 2 Apr 2000 03:51:04 +0000 (+0000)
Subject: * Makefile.in: Eliminate traces of cygwinisms.  Don't link with libmsvcrt.a.
X-Git-Tag: cygwin-1_1_1~54
X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=4306b49092fa36510b07158b263116cb1557d108;p=cygwin-apps%2Fsetup.git

* Makefile.in: Eliminate traces of cygwinisms.  Don't link with libmsvcrt.a.
It's unneeded.  Build .rc file on the fly from various sources.
* configure.in: Locate correct objcopy.
* configure: Regenerate.
---

diff --git a/ChangeLog b/ChangeLog
index 62d1c730..d5e36832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Apr  1 22:49:09 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Eliminate traces of cygwinisms.  Don't link with libmsvcrt.a.
+	It's unneeded.  Build .rc file on the fly from various sources.
+	* configure.in: Locate correct objcopy.
+	* configure: Regenerate.
+
 Sat Apr  1 20:48:09 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: New file.
diff --git a/Makefile.in b/Makefile.in
index 94da24cb..99c5747e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,36 +32,38 @@ CFLAGS:=@CFLAGS@
 CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -nostdinc++ -fno-rtti
 
 WINDRES:=@WINDRES@
+OBJCOPY:=@OBJCOPY@
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES:=-I$(mingw_source)/include -I$(cygwin_source)/include -I$(w32api_include)
+MINGW_INCLUDES:=-I$(mingw_source)/include -I$(w32api_include)
 
 MINGW_CXXFLAGS:=$(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES)
 MINGW_CFLAGS:=$(CFLAGS) -mno-cygwin $(MINGW_INCLUDES)
 
 ZLIB=zlib/libzcygw.a
+libmingw32.a:=$(mingw_build)/libmingw32.a
 libuser32:=$(w32api_lib)/libuser32.a
 libkernel32:=$(w32api_lib)/libkernel32.a
 ALL_DEP_LDLIBS:=$(ZLIB) $(w32api_lib)/libole32.a $(w32api_lib)/libwininet.a \
 		$(w32api_lib)/libnetapi32.a $(w32api_lib)/libadvapi32.a \
 		$(w32api_lib)/libuuid.a $(libkernel32) $(w32api_lib)/libuser32.a \
-		$(mingw_build)/libmsvcrt.a # $(mingw_build)/libmingw32.a
+		$(libmingw32)
 
 ALL_LDLIBS:=${patsubst $(mingw_build)/lib%.a,-l%,\
 	      ${patsubst $(w32api_lib)/lib%.a,-l%,\
-	        ${filter-out $(libuser32),\
-	         ${filter-out $(libkernel32), $(ALL_DEP_LDLIBS)}}}}
+		${filter-out $(libmingw32),\
+		  ${filter-out $(libuser32),\
+		    ${filter-out $(libkernel32), $(ALL_DEP_LDLIBS)}}}}}
 
 ALL_LDFLAGS:=${filter-out -I%, \
 	       ${filter-out -W%, \
-		-B$(newlib_build)/libc/ -B$(newlib_build)/libm/ \
-		-B$(w32api_lib)/ -B${mingw_build} $(LDFLAGS)}}
+		-B$(w32api_lib)/ -B${mingw_build}/ $(MINGW_CFLAGS) $(LDFLAGS)}}
 
 PROGS:=setup$(EXEEXT)
 
-WINSUP_DEPS:=$(cygwin_source)/winsup.h
-
+BUNDLED_FILES:=$(srcdir)/tar.exe.gz $(srcdir)/gzip.exe.gz \
+	       mount.exe.gz cygpath.exe.gz
 .SUFFIXES:
 .NOEXPORT:
 
@@ -69,12 +71,12 @@ WINSUP_DEPS:=$(cygwin_source)/winsup.h
 
 all: Makefile $(PROGS)
 
-setup$(EXEEXT): error.o memory.o setup.o strarry.o setupres.o $(ALL_DEP_LDLIBS)
+setup$(EXEEXT): error.o memory.o setup.o strarry.o cinstall.o $(ALL_DEP_LDLIBS)
 ifdef VERBOSE
-	$(CC) $(MINGW_CFLAGS) -o $@ ${wordlist 1,5,$^} $(ALL_LDFLAGS) $(ALL_LDLIBS)
+	$(CC) -o $@ ${wordlist 1,5,$^} $(ALL_LDFLAGS) $(ALL_LDLIBS)
 else
-	@echo $(CC) $(CFLAGS) -o $@ ${wordlist 1,5,$^} ${filter-out -B%, $(ALL_LDFLAGS) $(ALL_LDLIBS)};\
-	$(CC) $(MINGW_CFLAGS) -o $@ ${wordlist 1,5,$^} $(ALL_LDFLAGS) $(ALL_LDLIBS)
+	@echo $(CC) -o $@ ${wordlist 1,5,$^} ${filter-out -B%, $(ALL_LDFLAGS) $(ALL_LDLIBS)};\
+	$(CC) -o $@ ${wordlist 1,5,$^} $(ALL_LDFLAGS) $(ALL_LDLIBS)
 endif
 	@chmod a-x $@
 
@@ -82,7 +84,7 @@ mingw_getopt.o: $(cygwin_source)/getopt.c
 	$(CC) -c -o $@ $(MINGW_CFLAGS) $^
 
 clean:
-	rm -f *.o $(PROGS)
+	rm -f *.o $(PROGS) zlib/*.o zlib/*.a *.exe *.gz
 
 realclean: clean
 	rm -f  Makefile config.cache
@@ -94,19 +96,33 @@ install: all
 	  $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \
 	done
 
-$(mingw_build)/libmingw32.a: $(mingw_build)/Makefile
+$(libmingw32): $(mingw_build)/Makefile
 	@$(MAKE) -C $(@D) $(@F)
 
-zlib/libzcygw.a: zlib/Makefile
-	@make -C zlib
+zlib/zlibcygw.a: zlib/Makefile
+	@$(MAKE) -C zlib CFLAGS='$(MINGW_CFLAGS)'
+
+%.exe.gz: %.exe
+	gzip -9nf $?
+
+%.exe: $(utils_build)/%.exe
+	$(OBJCOPY) --strip-unneeded $? $@
+	
+$(utils_build)/%.exe: $(utils_build)/Makefile
+	@$(MAKE) -C $(utils_build) $(@F)
+
+cinstall.rc: $(BUNDLED_FILES)
+	for f in $^; do \
+	    echo `basename $$f .gz` FILE DISCARDABLE '"'$$f'"'; \
+	done > $@
 
 %.o: %.rc
 	$(WINDRES) -o $@ $?
 	
 %.o: %.c
 ifdef VERBOSE
-	$(CC) $(MINGW_CFLAGS) -c -o $@ $? -B$(mingw_build)/
+	$(CC) $(MINGW_CFLAGS) -c -o $@ $?
 else
 	@echo $(CC) -c -o $@ $? ${filter-out -B%, $(MINGW_CFLAGS)};\
-	$(CC) $(MINGW_CFLAGS) -c -o $@ $? -B$(mingw_build)/
+	$(CC) $(MINGW_CFLAGS) -c -o $@ $?
 endif
diff --git a/configure b/configure
index 59287325..2056e87b 100755
--- a/configure
+++ b/configure
@@ -1384,6 +1384,74 @@ fi
 fi
 
 
+# Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objcopy; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1391: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+OBJCOPY="$ac_cv_prog_OBJCOPY"
+if test -n "$OBJCOPY"; then
+  echo "$ac_t""$OBJCOPY" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_OBJCOPY"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "objcopy", so it can be a program name with args.
+set dummy objcopy; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1423: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$OBJCOPY"; then
+  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_OBJCOPY="objcopy"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_OBJCOPY" && ac_cv_prog_OBJCOPY="objcopy"
+fi
+fi
+OBJCOPY="$ac_cv_prog_OBJCOPY"
+if test -n "$OBJCOPY"; then
+  echo "$ac_t""$OBJCOPY" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  OBJCOPY="objcopy"
+fi
+fi
+
+
 
 SUBDIRS="zlib"
 subdirs="$SUBDIRS"
@@ -1560,6 +1628,7 @@ s%@RANLIB@%$RANLIB%g
 s%@LD@%$LD%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@WINDRES@%$WINDRES%g
+s%@OBJCOPY@%$OBJCOPY%g
 s%@subdirs@%$subdirs%g
 
 CEOF
diff --git a/configure.ac b/configure.ac
index f128ebcb..6f5a6057 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,8 @@ AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
 AC_SUBST(DLLTOOL)
 AC_CHECK_TOOL(WINDRES, windres, windres)
 AC_SUBST(WINDRES)
+AC_CHECK_TOOL(OBJCOPY, objcopy, objcopy)
+AC_SUBST(OBJCOPY)
 
 SUBDIRS="zlib"
 AC_CONFIG_SUBDIRS($SUBDIRS)
diff --git a/configure.in b/configure.in
index f128ebcb..6f5a6057 100644
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,8 @@ AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
 AC_SUBST(DLLTOOL)
 AC_CHECK_TOOL(WINDRES, windres, windres)
 AC_SUBST(WINDRES)
+AC_CHECK_TOOL(OBJCOPY, objcopy, objcopy)
+AC_SUBST(OBJCOPY)
 
 SUBDIRS="zlib"
 AC_CONFIG_SUBDIRS($SUBDIRS)
diff --git a/gzip.exe.gz b/gzip.exe.gz
new file mode 100755
index 00000000..032bf8a5
Binary files /dev/null and b/gzip.exe.gz differ
diff --git a/tar.exe.gz b/tar.exe.gz
new file mode 100755
index 00000000..b0e1dcfd
Binary files /dev/null and b/tar.exe.gz differ