Skip to content
Snippets Groups Projects
Commit 4059706b authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Now removes dependencies on the bundle directory.

Rev: bin/fixdepends.sh:1.22
parent 722c4ee5
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ fi ...@@ -15,6 +15,7 @@ fi
# Paths starting with $1 ==> $(SRCDIR) # Paths starting with $1 ==> $(SRCDIR)
# Paths starting with $2 ==> $(PIKE_SRC_DIR) # Paths starting with $2 ==> $(PIKE_SRC_DIR)
# Paths starting with $3/bundles/ ==> removed
# Paths starting with $3 ==> $(BUILD_BASE) # Paths starting with $3 ==> $(BUILD_BASE)
# Paths starting with `pwd` ==> empty # Paths starting with `pwd` ==> empty
# Rules for object files are duplicated for protos files (if needed). # Rules for object files are duplicated for protos files (if needed).
...@@ -30,6 +31,7 @@ d3="`echo \"$3\" | sed -e 's:[.*[\\^$@]:\\\\&:g'`" ...@@ -30,6 +31,7 @@ d3="`echo \"$3\" | sed -e 's:[.*[\\^$@]:\\\\&:g'`"
if grep .protos $1/Makefile.in >/dev/null 2>&1; then if grep .protos $1/Makefile.in >/dev/null 2>&1; then
sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \ sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \
-e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \ -e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \
-e "s@\([ ]\)$d3/bundles/[^ ]*@\1@g" \
-e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \ -e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \
-e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \ -e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \
-e 's/^\([-a-zA-Z0-9.,_]*\)\.o: /\1.o \1.protos: /g' \ -e 's/^\([-a-zA-Z0-9.,_]*\)\.o: /\1.o \1.protos: /g' \
...@@ -38,6 +40,7 @@ if grep .protos $1/Makefile.in >/dev/null 2>&1; then ...@@ -38,6 +40,7 @@ if grep .protos $1/Makefile.in >/dev/null 2>&1; then
else else
sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \ sed -e "s@\([ ]\)$d1/\([-a-zA-Z0-9.,_]*\)@\1\$(SRCDIR)/\2@g" \
-e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \ -e "s@\([ ]\)$d2/\([-a-zA-Z0-9.,_]*\)@\1\$(PIKE_SRC_DIR)/\2@g" \
-e "s@\([ ]\)$d3/bundles/[^ ]*@\1@g" \
-e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \ -e "s@\([ ]\)$d3/\([-a-zA-Z0-9.,_]*\)@\1\$(BUILD_BASE)/\2@g" \
-e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \ -e "s@\([ ]\)`pwd`\([^ ]\)*@\1./\2@" \
-e 's@\([ ]\)/[^ ]*@\1@g' \ -e 's@\([ ]\)/[^ ]*@\1@g' \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment