summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/slice2java')
-rw-r--r--cpp/src/slice2java/.depend2
-rw-r--r--cpp/src/slice2java/.depend.mak2
-rw-r--r--cpp/src/slice2java/Main.cpp2
-rw-r--r--cpp/src/slice2java/Makefile4
-rw-r--r--cpp/src/slice2java/Makefile.mak4
5 files changed, 1 insertions, 13 deletions
diff --git a/cpp/src/slice2java/.depend b/cpp/src/slice2java/.depend
deleted file mode 100644
index 12d6ec54f50..00000000000
--- a/cpp/src/slice2java/.depend
+++ /dev/null
@@ -1,2 +0,0 @@
-Gen$(OBJEXT): Gen.cpp $(includedir)/IceUtil/DisableWarnings.h Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Slice/JavaUtil.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/StringUtil.h $(includedir)/IceUtil/InputUtil.h
-Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/FileTracker.h $(includedir)/Slice/Parser.h $(includedir)/Slice/Util.h $(includedir)/IceUtil/OutputUtil.h Gen.h $(includedir)/Slice/JavaUtil.h $(includedir)/Slice/Checksum.h
diff --git a/cpp/src/slice2java/.depend.mak b/cpp/src/slice2java/.depend.mak
deleted file mode 100644
index 9567096283b..00000000000
--- a/cpp/src/slice2java/.depend.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-Gen$(OBJEXT): Gen.cpp "$(includedir)/IceUtil/DisableWarnings.h" Gen.h "$(includedir)/Slice/Parser.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Slice/JavaUtil.h" "$(includedir)/IceUtil/OutputUtil.h" "$(includedir)/Slice/Checksum.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/IceUtil/InputUtil.h"
-Main$(OBJEXT): Main.cpp "$(includedir)/IceUtil/Options.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/Slice/Preprocessor.h" "$(includedir)/Slice/FileTracker.h" "$(includedir)/Slice/Parser.h" "$(includedir)/Slice/Util.h" "$(includedir)/IceUtil/OutputUtil.h" Gen.h "$(includedir)/Slice/JavaUtil.h" "$(includedir)/Slice/Checksum.h"
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 41fdf0bde81..cd1bf50be6b 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -235,7 +235,7 @@ compile(int argc, char* argv[])
return EXIT_FAILURE;
}
- if(!icecpp->printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, includePaths,
+ if(!icecpp->printMakefileDependencies(depend ? Preprocessor::Java : Preprocessor::JavaXML, output, includePaths,
"-D__SLICE2JAVA__"
))
{
diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile
index 023295f65b2..75e03f8f23c 100644
--- a/cpp/src/slice2java/Makefile
+++ b/cpp/src/slice2java/Makefile
@@ -16,8 +16,6 @@ TARGETS = $(NAME)
OBJS = Gen.o \
Main.o
-SRCS = $(OBJS:.o=.cpp)
-
ifeq ($(CPP11),yes)
RPATH_DIR = @loader_path/../../lib/c++11
else
@@ -35,5 +33,3 @@ $(NAME): $(OBJS)
install:: all
$(call installprogram,$(NAME),$(DESTDIR)$(install_bindir))
$(call installdata,$(top_srcdir)/../man/man1/slice2java.1,$(DESTDIR)$(install_mandir))
-
-include .depend
diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak
index ec7060db497..17f6e1139ab 100644
--- a/cpp/src/slice2java/Makefile.mak
+++ b/cpp/src/slice2java/Makefile.mak
@@ -16,8 +16,6 @@ TARGETS = $(NAME)
OBJS = Gen.obj \
Main.obj
-SRCS = $(OBJS:.obj=.cpp)
-
!include $(top_srcdir)/config/Make.rules.mak
CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
@@ -48,5 +46,3 @@ install:: all
copy $(NAME:.exe=.pdb) "$(install_bindir)"
!endif
-
-!include .depend.mak