[Fedora-directory-commits] esc/src/app/xpcom/tray Makefile.sdk, 1.1, 1.2

Jack Magne jmagne at fedoraproject.org
Sat Apr 18 23:25:17 UTC 2009


Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25278/src/app/xpcom/tray

Modified Files:
	Makefile.sdk 
Log Message:
Fix for #496410.


Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.sdk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.sdk	4 Feb 2009 01:43:46 -0000	1.1
+++ Makefile.sdk	18 Apr 2009 23:25:14 -0000	1.2
@@ -23,20 +23,20 @@
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 ifeq ($(OS_ARCH),Linux)
-CXXFLAGS        += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS)
+CXXFLAGS        += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) $(NOTIFY_CXX_FLAGS) -fPIC
 endif
 
 
 # Change this to point at your Gecko SDK directory.
 ifndef GECKO_SDK_PATH
-GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9pre/sdk
+GECKO_SDK_PATH =/usr/lib/xulrunner-sdk-1.9/sdk
 endif
 GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/include
 ifndef GECKO_INCLUDE_PATH
-GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9pre
+GECKO_INCLUDE_PATH=/usr/include/xulrunner-sdk-1.9
 endif
 ifndef GECKO_BIN_PATH
-GECKO_BIN_PATH=/usr/lib/xulrunner-1.9pre
+GECKO_BIN_PATH=/usr/lib/xulrunner-1.9
 endif
 
 ifeq ($(OS_ARCH),Darwin)
@@ -148,6 +148,10 @@
 
 endif
 
+ifeq ($(OS_ARCH),Linux)
+GECKO_LD_LIBS= -L$(GECKO_SDK_PATH)/lib $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a
+endif
+
  
 # GCC only define which allows us to not have to #include mozilla-config 
 # in every .cpp file.  If your not using GCC remove this line and add 




More information about the Fedora-directory-commits mailing list