diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 10:26:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 10:26:03 +0000 |
| commit | 4b11c5ceb8a2fce6429a10892e272289e860fc56 (patch) | |
| tree | c4f1568f907374c3b876bbcec83daf8e73d0b2a2 /sysui/desktop | |
| parent | e96f8c5044ff284774c9e55801bac93e4509a1d7 (diff) | |
INTEGRATION: CWS sysui03 (1.5.52); FILE MERGED
2005/01/13 08:12:19 obr 1.5.52.3: #i36339# modification of /etc/mailcap and /etc/mime.types now done in the desktop integration packages
2004/12/21 12:59:08 obr 1.5.52.2: #i35698# replaced obsolete gnomeint by gnome-set-default-application
2004/12/14 10:02:58 obr 1.5.52.1: removed obsolete 1.x desktop integration
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/util/makefile.mk | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk index b4a407cadfca..758dc97ea6c7 100644 --- a/sysui/desktop/util/makefile.mk +++ b/sysui/desktop/util/makefile.mk @@ -61,34 +61,49 @@ PRJ=..$/.. PRJNAME=sysui TARGET=launcher +TARGETTYPE=CUI +LIBTARGET=NO +NO_DEFAULT_STL=TRUE +LIBSALCPPRT=$(0) + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -# --- Files -------------------------------------------------------- +.IF "$(ENABLE_GNOMEVFS)"!="" +COMPILER_WARN_ALL=TRUE +PKGCONFIG_MODULES=gnome-vfs-2.0 +.INCLUDE: pkg_config.mk + +.IF "$(OS)" == "SOLARIS" +LINKFLAGS+=-z nodefs +.ENDIF # "$(OS)" == "SOLARIS" -ZIPFLAGS= -u -r +# Disable lazy binding of symbols +.IF "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" +LINKFLAGS+=-z now +.ENDIF -ZIP1TARGET = kdeapp -ZIP1LIST = share/applnk/* -ZIP1DIR = $(MISC)$/kde +.IF "$(OS)" == "LINUX" +# hack for faked SO environment +CFLAGS+=-gdwarf-2 +PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS) +.ENDIF + +.ENDIF # "$(ENABLE_GNOMEVFS)"!="" + +# --- Files -------------------------------------------------------- -ZIP2TARGET = kdemime -ZIP2LIST = share/mimelnk/* -ZIP2DIR = $(MISC)$/kde +.IF "$(ENABLE_GNOMEVFS)"!="" +OBJFILES += $(OBJ)$/gnome-set-default-application.obj -ZIP3TARGET = gnome2apps -ZIP3LIST = *.desktop -ZIP3DIR = $(MISC)$/gnome +APP1TARGET=gnome-set-default-application +APP1OBJS=$(OBJ)$/gnome-set-default-application.obj +APP1LIBS= +APP1STDLIBS+=$(PKGCONFIG_LIBS) +.ENDIF # "$(ENABLE_GNOMEVFS)"!="" SCRIPTS= \ - $(BIN)$/update-mime-data.sh \ - $(BIN)$/update-user-mime-data.sh \ - $(BIN)$/update-redhat-user-menus.sh \ - $(BIN)$/update-suse-user-menus.sh \ - $(BIN)$/update-user-menus.sh \ - $(BIN)$/functions.sh \ - $(BIN)$/gnomeint.sh \ $(BIN)$/viewdoc.sh # --- Targets ------------------------------------------------------ |