diff options
| author | Wayne Davison <wayne@opencoder.net> | 2020-06-20 08:44:04 -0700 |
|---|---|---|
| committer | Wayne Davison <wayne@opencoder.net> | 2020-06-20 09:06:18 -0700 |
| commit | 9467c1f9b9b581e3abe78e00cc71de06fc175887 (patch) | |
| tree | 49ab2d9fbd8c9d8f6577a532a822d12ff41f7ecd /Makefile.in | |
| parent | 04653dabc8dff8c85d75ccab57749e0af91a03cb (diff) | |
| download | rsync-9467c1f9b9b581e3abe78e00cc71de06fc175887.tar.gz | |
Fix conditional directives in the asm file
- Switch .s -> .S to enable the preprocessor.
- Move some defines from mdigest.h to md-defines.h.
- Tweak the asm file to use md-defines.h.
- Add a couple missing .h dependencies in the Makefile.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 5fe567a8..7b37b710 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,7 @@ SIMD_x86_64=simd-checksum-x86_64.o lib/md5-asm-x86_64.o GENFILES=configure.sh aclocal.m4 config.h.in proto.h proto.h-tstamp rsync.1 rsync.1.html \ rsync-ssl.1 rsync-ssl.1.html rsyncd.conf.5 rsyncd.conf.5.html HEADERS=byteorder.h config.h errcode.h proto.h rsync.h ifuncs.h itypes.h inums.h \ - lib/pool_alloc.h + lib/pool_alloc.h lib/mdigest.h lib/md-defines.h LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \ lib/permstring.o lib/pool_alloc.o lib/sysacls.o lib/sysxattrs.o @LIBOBJS@ zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ @@ -134,8 +134,8 @@ rounding.h: rounding.c rsync.h proto.h simd-checksum-x86_64.o: simd-checksum-x86_64.cpp $(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp -lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s - $(CC) -I. -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s +lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.S config.h lib/md-defines.h + $(CC) -I. -c -o $@ $(srcdir)/lib/md5-asm-x86_64.S tls$(EXEEXT): $(TLS_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) |