110 lines
5.7 KiB
Diff
110 lines
5.7 KiB
Diff
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.am CASA-1.6.659/c_adlib/ad_gk/Makefile.am
|
|
--- CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.am 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_adlib/ad_gk/Makefile.am 2007-02-05 14:53:58.000000000 +0100
|
|
@@ -48,7 +48,7 @@ MODULE_EXT =dll
|
|
CSFILES = $(srcdir)/GnomeKeyring.cs
|
|
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp
|
|
+CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp-2.0
|
|
CS_RESOURCES =
|
|
CS_LIBS =
|
|
CS_LIBPATH =
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.in CASA-1.6.659/c_adlib/ad_gk/Makefile.in
|
|
--- CASA-1.6.659.orig/c_adlib/ad_gk/Makefile.in 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_adlib/ad_gk/Makefile.in 2007-02-05 14:53:58.000000000 +0100
|
|
@@ -217,7 +217,7 @@ MODULE_NAME = Novell.CASA.DataEngines.Gn
|
|
MODULE_EXT = dll
|
|
CSFILES = $(srcdir)/GnomeKeyring.cs
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp
|
|
+CS_FLAGS = $(CSC_LIBFLAG) /target:library -pkg:gtk-sharp-2.0
|
|
CS_RESOURCES =
|
|
CS_LIBS =
|
|
CS_LIBPATH =
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/Makefile.am CASA-1.6.659/c_adlib/Makefile.am
|
|
--- CASA-1.6.659.orig/c_adlib/Makefile.am 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_adlib/Makefile.am 2007-02-05 14:53:58.000000000 +0100
|
|
@@ -56,7 +56,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
|
|
$(top_srcdir)/c_gui/Logger.cs
|
|
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp /d:LINUX
|
|
+CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp-2.0 /d:LINUX
|
|
CS_RESOURCES =
|
|
CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll \
|
|
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.KWallet.dll \
|
|
diff -pruN CASA-1.6.659.orig/c_adlib/Makefile.in CASA-1.6.659/c_adlib/Makefile.in
|
|
--- CASA-1.6.659.orig/c_adlib/Makefile.in 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_adlib/Makefile.in 2007-02-05 14:53:58.000000000 +0100
|
|
@@ -226,7 +226,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
|
|
$(top_srcdir)/c_gui/Logger.cs
|
|
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp /d:LINUX
|
|
+CS_FLAGS = $(CSC_LIBFLAG) -pkg:gtk-sharp-2.0 /d:LINUX
|
|
CS_RESOURCES =
|
|
CS_LIBS = $(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.GnomeKeyring.dll \
|
|
$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.DataEngines.KWallet.dll \
|
|
diff -pruN CASA-1.6.659.orig/c_gui/Makefile.am CASA-1.6.659/c_gui/Makefile.am
|
|
--- CASA-1.6.659.orig/c_gui/Makefile.am 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_gui/Makefile.am 2007-02-05 14:55:37.000000000 +0100
|
|
@@ -74,7 +74,7 @@ CSFILES =$(srcdir)/AssemblyInfo.cs \
|
|
$(srcdir)/Common.cs
|
|
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = -pkg:gtk-sharp -pkg:glade-sharp -d:LINUX -nowarn:169
|
|
+CS_FLAGS = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -d:LINUX -nowarn:169
|
|
CS_RESOURCES =
|
|
CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \
|
|
$(CASALIBDIR)/Novell.CASA.miCASAWrapper.dll \
|
|
diff -pruN CASA-1.6.659.orig/c_gui/Makefile.in CASA-1.6.659/c_gui/Makefile.in
|
|
--- CASA-1.6.659.orig/c_gui/Makefile.in 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/c_gui/Makefile.in 2007-02-05 14:55:37.000000000 +0100
|
|
@@ -241,7 +241,7 @@ CSFILES = $(srcdir)/AssemblyInfo.cs \
|
|
$(srcdir)/Common.cs
|
|
|
|
CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
|
|
-CS_FLAGS = -pkg:gtk-sharp -pkg:glade-sharp -d:LINUX -nowarn:169
|
|
+CS_FLAGS = -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -d:LINUX -nowarn:169
|
|
CS_RESOURCES =
|
|
CS_LIBS = $(CASALIBDIR)/Novell.CASA.Common.dll \
|
|
$(CASALIBDIR)/Novell.CASA.miCASAWrapper.dll \
|
|
diff -pruN CASA-1.6.659.orig/make/defaults.lux CASA-1.6.659/make/defaults.lux
|
|
--- CASA-1.6.659.orig/make/defaults.lux 2007-02-05 14:17:50.000000000 +0100
|
|
+++ CASA-1.6.659/make/defaults.lux 2007-02-05 14:55:37.000000000 +0100
|
|
@@ -39,7 +39,7 @@ ifeq ($(module),kwwrap)
|
|
endif
|
|
|
|
ifeq ($(module),gkwrap)
|
|
- CFLAGS = /target:"library" -pkg:gtk-sharp
|
|
+ CFLAGS = /target:"library" -pkg:gtk-sharp-2.0
|
|
OFILE = -out:"$(CSLIBDIR)$@"dll
|
|
EXT = dll
|
|
endif
|
|
@@ -51,7 +51,7 @@ ifeq ($(module),ffwrap)
|
|
endif
|
|
|
|
ifeq ($(module),adlib)
|
|
- CFLAGS = /target:"library" -pkg:gtk-sharp -lib:"$(CSLIBDIR)" -lib:../c_adlib/ad_gk/ -lib:../c_adlib/ad_kw/ -lib:../c_adlib/ad_ff/ /r:Novell.CASA.DataEngines.GnomeKeyring.dll /r:Novell.CASA.DataEngines.KWallet.dll /r:Novell.CASA.DataEngines.FireFox.dll /r:Novell.CASA.CASAPolicy.dll /r:Novell.CASA.miCASAWrapper.dll
|
|
+ CFLAGS = /target:"library" -pkg:gtk-sharp-2.0 -lib:"$(CSLIBDIR)" -lib:../c_adlib/ad_gk/ -lib:../c_adlib/ad_kw/ -lib:../c_adlib/ad_ff/ /r:Novell.CASA.DataEngines.GnomeKeyring.dll /r:Novell.CASA.DataEngines.KWallet.dll /r:Novell.CASA.DataEngines.FireFox.dll /r:Novell.CASA.CASAPolicy.dll /r:Novell.CASA.miCASAWrapper.dll
|
|
OFILE = -out:"$(CSLIBDIR)$@"dll
|
|
EXT = dll
|
|
endif
|
|
@@ -63,13 +63,13 @@ ifeq ($(module),csssd)
|
|
endif
|
|
|
|
ifeq ($(module),casamanager)
|
|
- CFLAGS = -lib:../c_micasad/test/dependencies/ -lib:"$(CSLIBDIR)" /r:$(CSLIBDIR)Novell.CASA.miCASAWrapper.dll /r:Novell.CASA.A-D.dll /r:Novell.CASA.CASAPolicy.dll -pkg:gtk-sharp -pkg:glade-sharp /r:Novell.CASA.Common.dll
|
|
+ CFLAGS = -lib:../c_micasad/test/dependencies/ -lib:"$(CSLIBDIR)" /r:$(CSLIBDIR)Novell.CASA.miCASAWrapper.dll /r:Novell.CASA.A-D.dll /r:Novell.CASA.CASAPolicy.dll -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 /r:Novell.CASA.Common.dll
|
|
OFILE = -out:"$(CSBINDIR)$@"exe
|
|
EXT = bin
|
|
endif
|
|
|
|
ifeq ($(module),trayapp)
|
|
- CFLAGS = -lib:../c_micasad/test/dependencies/ -pkg:gtk-sharp -lib:"$(CSLIBDIR)" /r:Novell.CASA.Common.dll -pkg:glade-sharp /r:Novell.CASA.miCASAWrapper.dll
|
|
+ CFLAGS = -lib:../c_micasad/test/dependencies/ -pkg:gtk-sharp-2.0 -lib:"$(CSLIBDIR)" /r:Novell.CASA.Common.dll -pkg:glade-sharp-2.0 /r:Novell.CASA.miCASAWrapper.dll
|
|
OFILE = -out:"$(CSBINDIR)$@"exe
|
|
EXT = bin
|
|
endif
|