diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-11 19:42:32 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-11 19:42:32 +0000 |
| commit | c60a8a994f74eb1bb3dff3bc47c38c727500c9f6 (patch) | |
| tree | 084d173c2cdc0493beba65dfdfd1c4a77ab5b060 | |
| parent | 50143b1b6f026d55bfc9156b84c3dee0773e47f5 (diff) | |
Undo size optimizing patch that does not work with gcc-4.1-head, reported by sjhill, thanks cow for testing
| -rw-r--r-- | libcrypt/Makefile | 11 | ||||
| -rw-r--r-- | libutil/Makefile | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/libcrypt/Makefile b/libcrypt/Makefile index 86781e4c5..a4b8f5980 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -39,10 +39,13 @@ else all: $(AR_LIB_NAME) endif -$(AR_LIB_NAME): $(LIB_NAME).o +# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away +# $(AR_LIB_NAME): $(LIB_NAME).o + +$(AR_LIB_NAME): $(OBJS) $(INSTALL) -d $(TOPDIR)lib $(RM) $@ - $(AR) $(ARFLAGS) $@ $< + $(AR) $(ARFLAGS) $@ $^ $(SO_LIB_NAME): $(AR_LIB_NAME) $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ @@ -57,5 +60,9 @@ $(LIB_NAME).o: $(CSRC) $(CC) $(CFLAGS) -o $@ -c $^ $(STRIPTOOL) -x -R .note -R .comment $@ +$(OBJS): %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + $(STRIPTOOL) -x -R .note -R .comment $*.o + clean: $(RM) *.o *~ core diff --git a/libutil/Makefile b/libutil/Makefile index e825b2aba..db440dbf1 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -42,10 +42,13 @@ else all: $(AR_LIB_NAME) endif -$(AR_LIB_NAME): $(LIB_NAME).o +# psm: 20051007 gcc-4.1-head optimizes crypt()/__des_crypt() away +# $(AR_LIB_NAME): $(LIB_NAME).o + +$(AR_LIB_NAME): $(OBJS) $(INSTALL) -d $(TOPDIR)lib $(RM) $@ - $(AR) $(ARFLAGS) $@ $< + $(AR) $(ARFLAGS) $@ $^ $(SO_LIB_NAME): $(AR_LIB_NAME) $(RM) $(TOPDIR)lib/$(SO_FULL_NAME) $(SO_LIB_NAME).$(MAJOR_VERSION) $@ @@ -60,5 +63,9 @@ $(LIB_NAME).o: $(CSRC) $(CC) $(CFLAGS) -o $@ -c $^ $(STRIPTOOL) -x -R .note -R .comment $@ +$(OBJS): %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + $(STRIPTOOL) -x -R .note -R .comment $*.o + clean: $(RM) *.o *~ core |