Fixed some complications

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5127 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Lyndon Tremblay 1999-11-03 08:39:18 +00:00
parent 4e21a3b979
commit 8ff42f9ba1
2 changed files with 3 additions and 3 deletions

View file

@ -172,7 +172,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
$(CC) -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@ $<
$(JAVA_OBJ_PREFIX)%.class : %.java
if [ $< -nt $(JAVA_OBJ_PREFIX)/`(grep \"package\" $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ ]; then \
if [ $< -nt $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ -o ! -f $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ ]; then \
$(JAVAC) $(ALL_JAVAFLAGS) $< -d $(JAVA_OBJ_PREFIX); \
fi

View file

@ -272,7 +272,7 @@ SHARED_LIB_LINK_CMD = \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \
$(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
$(LN_S) -f $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
fi; \
)
AFTER_INSTALL_SHARED_LIB_COMMAND = \
@ -281,7 +281,7 @@ AFTER_INSTALL_SHARED_LIB_COMMAND = \
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \
$(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
$(LN_S) -f $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \
fi; \
)
OBJ_MERGE_CMD = \