Branch: master

947ca060 2015-09-27 03:58:07 Slávek Banko
Fix hardcoded link to dl library

Signed-off-by: Slávek Banko <slavek.banko@...>
M src/Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f5d183..7fd533c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,10 +29,10 @@
 
 AM_CPPFLAGS = $(GPGME_CFLAGS)
 
-libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
+libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
 
 libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -ltdeio $(LIB_TDEUI) $(LIB_TDECORE) \
-	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx -ldl -lartsc
+	$(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdeui -ltdecore $(LIB_QT) -ltdefx $(LIBDL) -lartsc
 
 libbasketcommon_la_SOURCES = \
 	archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
@@ -55,7 +55,7 @@
 bin_PROGRAMS = basket
 
 # the application source, library search path, and link libraries
-basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
+basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEUTILS) -ltdecore -lDCOP -ltdeui $(LIB_QT) -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
 basket_LDADD = libbasketcommon.la
 
 # this is where the desktop file will go
@@ -81,11 +81,11 @@
 kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
 
 libbasketpart_la_SOURCES = basket_part.cpp
-libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
+libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde -lartskde
 libbasketpart_la_LIBADD  = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
 
 kcm_basket_la_SOURCES = kcm_basket.cpp
-kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde
+kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx $(LIBDL) -lartsc -lartskde
 kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_TDECORE) $(LIB_QT) -ltdeui -lDCOP
 
 # this is where the desktop file will go
8d28dcef 2015-09-27 03:58:28 Slávek Banko
Fix FTBFS with clang

Signed-off-by: Slávek Banko <slavek.banko@...>
M src/notefactory.h
diff --git a/src/notefactory.h b/src/notefactory.h
index 50caa60..4202e0b 100644
--- a/src/notefactory.h
+++ b/src/notefactory.h
@@ -32,8 +32,6 @@
 class Basket;
 class Note;
 
-enum NoteType::Id;
-
 /** Factory class to create (new, drop, past) or load BasketIem, and eventuelly save them (?)
   * @author S�bastien Lao�t
   */