mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
Added -fPIC flag for start-menu applet code, that prevented linkage.
Common menu code will be compiled now once in separate library.
This commit is contained in:
parent
5de582c27b
commit
75aca1e984
@ -31,9 +31,8 @@ rule PanelApplet
|
||||
Main $(target) : $(>) ;
|
||||
ObjectC++Flags $(>) : -fPIC $(FLTKINCLUDE) -I [ FDirName $(TOP) ede-panel ] $(EDELIBINCLUDE) ;
|
||||
|
||||
LinkAgainst $(target) : $(NETWMLIB) $(EDELIBLIB) $(EDELIB_GUI_LIB) $(FLTKLIB) $(STDLIB) ;
|
||||
LinkAgainst $(target) : $(NETWMLIB) $(3) $(EDELIBLIB) $(EDELIB_GUI_LIB) $(FLTKLIB) $(STDLIB) ;
|
||||
LINKFLAGS on $(target) = -shared -rdynamic [ on $(target) return $(LINKFLAGS) ] ;
|
||||
LINKLIBS on $(target) = [ on $(target) return $(LINKLIBS) ] $(3) ;
|
||||
|
||||
InstallProgram $(EDE_PANEL_APPLETS_DIR) : $(target) ;
|
||||
|
||||
|
@ -12,10 +12,10 @@ SubDir TOP ede-panel applets start-menu ;
|
||||
|
||||
MENU_SRC = XdgMenuReader.cpp DesktopEntry.cpp MenuRules.cpp ;
|
||||
|
||||
# TODO: MENU_SRC files will be compiled twice, once for applet and once for test program.
|
||||
Library libmenu : $(MENU_SRC) ;
|
||||
ObjectC++Flags $(MENU_SRC) : -fPIC $(FLTKINCLUDE) -I [ FDirName $(TOP) ede-panel ] $(EDELIBINCLUDE) ;
|
||||
|
||||
# applet
|
||||
PanelApplet start_menu : StartMenu.cpp $(MENU_SRC) ;
|
||||
PanelApplet start_menu : StartMenu.cpp : -L$(SUBDIR) -lmenu ;
|
||||
|
||||
# test program
|
||||
EdeProgram ede-menu-spec-test : ede-menu-spec-test.cpp $(MENU_SRC) ;
|
||||
EdeProgram ede-menu-spec-test : ede-menu-spec-test.cpp ;
|
||||
LinkAgainstAsFirst ede-menu-spec-test : -L$(SUBDIR) -lmenu ;
|
||||
|
Loading…
Reference in New Issue
Block a user