diff options
| author | Moritz Schulte <mo@g10code.com> | 2003-08-27 15:04:07 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2003-08-27 15:04:07 +0000 |
| commit | 03ee389bd247815f6d2e8f71acb59092fb2eed46 (patch) | |
| tree | 464d0398efa878963115903afa70700f655d4fdc | |
| parent | 5024734ba4f2e9b13a4b5c0ed05c0e8324e1b6de (diff) | |
| download | libgcrypt-03ee389bd247815f6d2e8f71acb59092fb2eed46.tar.gz | |
2003-08-19 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am (SUFFIXES): New variable.
(.S.o, .S.lo, .S.obj): Rewritten.
| -rw-r--r-- | mpi/ChangeLog | 5 | ||||
| -rw-r--r-- | mpi/Makefile.am | 24 |
2 files changed, 18 insertions, 11 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog index c3ca78f3..ef034d08 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,8 @@ +2003-08-19 Marcus Brinkmann <marcus@g10code.de> + + * Makefile.am (SUFFIXES): New variable. + (.S.o, .S.lo, .S.obj): Rewritten. + 2003-07-30 Moritz Schulte <moritz@g10code.com> * longlong.h (__clz_tab): Renamed to _gcry_clz_tab. diff --git a/mpi/Makefile.am b/mpi/Makefile.am index 7c79256b..83f0452c 100644 --- a/mpi/Makefile.am +++ b/mpi/Makefile.am @@ -169,20 +169,22 @@ libmpi_la_SOURCES = longlong.h \ mpicoder.c \ mpih-div.c \ mpih-mul.c \ - mpiutil.c + mpiutil.c libmpi_la_LIBADD = @MPI_MOD_LIST_LO@ libmpi_la_DEPENDENCIES = @MPI_MOD_LIST_LO@ -# we need our own rules here to preprocess the .S files -# libtool has now working support for assembiles. It does for example not -# work when building only a static library. -.S.o: - $(CPP) $(INCLUDES) $(DEFS) `test -f '$<' || echo '$(srcdir)/'`$< | grep -v '^#' > _$*.s - $(CCASCOMPILE) -c _$*.s - mv -f _$*.o $@ +# Because we are circumventing automake with regards to assembler +# files, we have to define our own rules. + +SUFFIXES = .S .o .obj .lo + +.S.o: + $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.S.obj: + $(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + .S.lo: - $(CPP) $(INCLUDES) $(DEFS) -DPIC `test -f '$<' || echo '$(srcdir)/'`$< | grep -v '^#' > __$*.s - $(CCASCOMPILE) -c __$*.s - mv -f __$*.o $@ + $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< |