diff options
| author | Jose <jose@zeroc.com> | 2012-07-24 20:29:58 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-24 20:29:58 +0200 |
| commit | d6c450df897c4630d80adee8014bdaaf6b9e480a (patch) | |
| tree | 4bbe304152dba3ab74275cf5f44d2f963433edc0 /cpp | |
| parent | Remove BCC support (diff) | |
| download | ice-d6c450df897c4630d80adee8014bdaaf6b9e480a.tar.bz2 ice-d6c450df897c4630d80adee8014bdaaf6b9e480a.tar.xz ice-d6c450df897c4630d80adee8014bdaaf6b9e480a.zip | |
Fix makepend.py generated headers dependencies
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 54a478cd218..9fbff56550c 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -315,10 +315,14 @@ all:: $(SRCS) $(TARGETS) depend:: $(SRCS) $(patsubst $(SDIR)/%.ice,$(HDIR)/%.h,$(wildcard $(SDIR)/*F.ice)) $(SLICE_SRCS) -rm -f .depend .depend.mak if test -n "$(SRCS)" ; then \ - $(CXX) -DMAKEDEPEND -M $(CXXFLAGS) $(CPPFLAGS) $(SRCS) | $(ice_dir)/config/makedepend.py; \ + $(CXX) -DMAKEDEPEND -M $(CXXFLAGS) $(CPPFLAGS) $(SRCS) | $(ice_dir)/config/makedepend.py; \ fi if test -n "$(SLICE_SRCS)" ; then \ - $(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | $(ice_dir)/config/makedepend.py; \ + if test -n "$(HDIR)"; then \ + $(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | $(ice_dir)/config/makedepend.py "\$$(HDIR)"; \ + else \ + $(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | $(ice_dir)/config/makedepend.py; \ + fi \ fi clean:: |