From d10dac1187fbb12fdb44a0386f1619b79b40d264 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Tue, 12 Jan 2016 16:25:30 -0500 Subject: Move Makefiles to Makefile.in Create Makefile's from Makefile.in Rename Makefile.org to Makefile.in Rename Makefiles to Makefile.in Address review feedback from Viktor and Richard Reviewed-by: Viktor Dukhovni Reviewed-by: Richard Levitte --- crypto/async/Makefile | 128 ----------------------------------------------- crypto/async/Makefile.in | 81 ++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 128 deletions(-) delete mode 100644 crypto/async/Makefile create mode 100644 crypto/async/Makefile.in (limited to 'crypto/async') diff --git a/crypto/async/Makefile b/crypto/async/Makefile deleted file mode 100644 index bdecc4e..0000000 --- a/crypto/async/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# -# OpenSSL/crypto/async/Makefile -# - -DIR= async -TOP= ../.. -CC= cc -INCLUDES= -CFLAG=-g -MAKEFILE= Makefile -AR= ar r - -CFLAGS= $(INCLUDES) $(CFLAG) - -GENERAL=Makefile -TEST= -APPS= - -LIB=$(TOP)/libcrypto.a -LIBSRC=async.c async_err.c arch/async_posix.c arch/async_win.c arch/async_null.c -LIBOBJ=async.o async_err.o arch/async_posix.o arch/async_win.o arch/async_null.o - -SRC= $(LIBSRC) - -HEADER= async_locl.h arch/async_posix.h arch/async_win.h arch/async_null.h - -ALL= $(GENERAL) $(SRC) $(HEADER) - -top: - (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) - -all: lib - -lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - -tags: - ctags $(SRC) - -tests: - -lint: - lint -DLINT $(INCLUDES) $(SRC)>fluff - -update: depend - -depend: - @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... - $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) - -dclean: - $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new - mv -f Makefile.new $(MAKEFILE) - -clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff - rm -f arch/*.o arch/*.obj arch/lib arch/tags arch/core arch/.pure arch/.nfs* arch/*.old arch/*.bak arch/fluff - -# Different flavours of make disagree on where output goes -.c.o: - $(CC) $(CFLAGS) -c $< -o $@ - -# DO NOT DELETE THIS LINE -- make depend depends on it. - -arch/async_null.o: ../../e_os.h ../../include/openssl/async.h -arch/async_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -arch/async_null.o: ../../include/openssl/opensslconf.h -arch/async_null.o: ../../include/openssl/opensslv.h -arch/async_null.o: ../../include/openssl/ossl_typ.h -arch/async_null.o: ../../include/openssl/safestack.h -arch/async_null.o: ../../include/openssl/stack.h -arch/async_null.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h -arch/async_null.o: arch/../arch/async_posix.h arch/../arch/async_win.h -arch/async_null.o: arch/../async_locl.h arch/async_null.c -arch/async_posix.o: ../../e_os.h ../../include/openssl/async.h -arch/async_posix.o: ../../include/openssl/crypto.h -arch/async_posix.o: ../../include/openssl/e_os2.h -arch/async_posix.o: ../../include/openssl/opensslconf.h -arch/async_posix.o: ../../include/openssl/opensslv.h -arch/async_posix.o: ../../include/openssl/ossl_typ.h -arch/async_posix.o: ../../include/openssl/safestack.h -arch/async_posix.o: ../../include/openssl/stack.h -arch/async_posix.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h -arch/async_posix.o: arch/../arch/async_posix.h arch/../arch/async_win.h -arch/async_posix.o: arch/../async_locl.h arch/async_posix.c -arch/async_win.o: ../../e_os.h ../../include/openssl/async.h -arch/async_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -arch/async_win.o: ../../include/openssl/opensslconf.h -arch/async_win.o: ../../include/openssl/opensslv.h -arch/async_win.o: ../../include/openssl/ossl_typ.h -arch/async_win.o: ../../include/openssl/safestack.h -arch/async_win.o: ../../include/openssl/stack.h -arch/async_win.o: ../../include/openssl/symhacks.h arch/../arch/async_null.h -arch/async_win.o: arch/../arch/async_posix.h arch/../arch/async_win.h -arch/async_win.o: arch/../async_locl.h arch/async_win.c -async.o: ../../e_os.h ../../include/openssl/async.h ../../include/openssl/bio.h -async.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -async.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -async.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -async.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h -async.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -async.o: arch/async_null.h arch/async_posix.h arch/async_win.h async.c -async.o: async_locl.h -async_err.o: ../../include/openssl/async.h ../../include/openssl/bio.h -async_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -async_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -async_err.o: ../../include/openssl/opensslconf.h -async_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -async_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -async_err.o: ../../include/openssl/symhacks.h async_err.c diff --git a/crypto/async/Makefile.in b/crypto/async/Makefile.in new file mode 100644 index 0000000..150bd11 --- /dev/null +++ b/crypto/async/Makefile.in @@ -0,0 +1,81 @@ +# +# OpenSSL/crypto/async/Makefile +# + +DIR= async +TOP= ../.. +CC= cc +INCLUDES= +CFLAG=-g +MAKEFILE= Makefile +AR= ar r + +CFLAGS= $(INCLUDES) $(CFLAG) + +GENERAL=Makefile +TEST= +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC=async.c async_err.c arch/async_posix.c arch/async_win.c arch/async_null.c +LIBOBJ=async.o async_err.o arch/async_posix.o arch/async_win.o arch/async_null.o + +SRC= $(LIBSRC) + +HEADER= async_locl.h arch/async_posix.h arch/async_win.h arch/async_null.h + +ALL= $(GENERAL) $(SRC) $(HEADER) + +top: + (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) + +all: lib + +lib: $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) + $(RANLIB) $(LIB) || echo Never mind. + @touch lib + +files: + $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO + +links: + @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) + @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) + +install: + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ + do \ + (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ + chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ + done; + +tags: + ctags $(SRC) + +tests: + +lint: + lint -DLINT $(INCLUDES) $(SRC)>fluff + +update: depend + +depend: + @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... + $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) + +dclean: + $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new + mv -f Makefile.new $(MAKEFILE) + +clean: + rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f arch/*.o arch/*.obj arch/lib arch/tags arch/core arch/.pure arch/.nfs* arch/*.old arch/*.bak arch/fluff + +# Different flavours of make disagree on where output goes +.c.o: + $(CC) $(CFLAGS) -c $< -o $@ + +# DO NOT DELETE THIS LINE -- make depend depends on it. -- cgit v1.1