Permalink
Browse files

fix make dist (no installation).

svn path=/trunk/olive/; revision=126455
  • Loading branch information...
1 parent b4b563c commit 5780cf36965f3cf82069857b94d7084e47e548c4 @atsushieno atsushieno committed Feb 10, 2009
@@ -21,11 +21,7 @@ EXTRA_DISTFILES = \
CLEAN_FILES = $(RESX_RES)
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
include ../../../build/library.make
@@ -34,10 +30,3 @@ $(the_lib): $(RESX_RES)
$(RESX_RES): %.resources: %.resx
$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -12,4 +12,6 @@ EXTRA_DISTFILES = App.ico \
nunit-console.exe.config.net_2_0 \
nunit-console.exe.config.net_3_5
+NO_INSTALL = yes
+
include ../../../build/executable.make
@@ -13,18 +13,7 @@ NO_TEST = yo
EXTRA_DISTFILES = nunit-console.csproj nunit-console_VS2005.csproj
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -1,4 +1,4 @@
-thisdir = nunit20/NUnitCore/core
+thisdir = nunit24/NUnitCore/core
SUBDIRS =
include ../../../build/rules.make
@@ -8,20 +8,9 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:nunit.core.interfaces.dll -r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
EXTRA_DISTFILES = nunit.core.dll.csproj nunit.core.dll_VS2005.csproj
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -11,22 +11,11 @@ LIB_MCS_FLAGS = \
/r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
EXTRA_DISTFILES = \
nunit.core.extensions.dll.csproj \
nunit.core.extensions.dll_VS2005.csproj
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -8,22 +8,11 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
EXTRA_DISTFILES = \
nunit.framework.extensions.dll.csproj \
nunit.framework.extensions.dll_VS2005.csproj
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -9,22 +9,11 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LIB_MCS_FLAGS = -debug /r:System.Xml.dll /r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
EXTRA_DISTFILES = \
nunit.framework.dll.csproj \
nunit.framework.dll_VS2005.csproj
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)
@@ -8,22 +8,11 @@ LIBRARY_SNK = $(topdir)/nunit24/nunit.snk
LOCAL_MCS_FLAGS= -debug -r:nunit.framework.dll -r:System.dll /d:StronglyNamedAssembly
NO_TEST = yo
-ifeq (net_2_0, $(PROFILE))
NO_INSTALL = yes
-install-local: install-symlink
-uninstall-local: uninstall-symlink
-endif
EXTRA_DISTFILES = \
nunit.mocks.csproj \
nunit.mocks_VS2005.csproj
include ../../../build/library.make
-symlinkdir = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-install-symlink:
- $(MKINSTALLDIRS) $(DESTDIR)$(symlinkdir)
- cd $(DESTDIR)$(symlinkdir) && rm -f $(LIBRARY_NAME) && ln -s ../1.0/$(LIBRARY_NAME) $(LIBRARY_NAME)
-
-uninstall-symlink:
- rm -f $(DESTDIR)$(symlinkdir)/$(LIBRARY_NAME)

0 comments on commit 5780cf3

Please sign in to comment.