[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeadmin
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-03-17 20:45:11
[Download RAW message or body]

CVS commit by mueller: 

automake fixes


  M +2 -3      kwuftpd/Makefile.am   1.28
  M +0 -1      kwuftpd/ftpaccess.cpp   1.18
  M +2 -7      secpolicy/Makefile.am   1.4


--- kdeadmin/kwuftpd/Makefile.am  #1.27:1.28
@@ -1,6 +1,4 @@
 
 INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH)
-LDADD = $(LIB_KFILE)
 
 kwuftpd_SOURCES = kwuftpd.cpp UserClasses.cpp NewClass.cpp ftpaccess.cpp \
@@ -15,5 +13,6 @@
                   UploadsBase.ui UserClassesBase.ui VirtualBase.ui
 
-METASOURCES = AUTO
+kwuftpd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwuftpd_LDADD = $(LIB_KFILE)
 
 noinst_HEADERS = kwuftpd.h UserClasses.h NewClass.h ftpaccess.h support.h \

--- kdeadmin/kwuftpd/ftpaccess.cpp  #1.17:1.18
@@ -7,5 +7,4 @@
 #include <stdlib.h>
 #include <string.h>
-#include <strstream.h>
 #include <ctype.h>
 #include <stdio.h>

--- kdeadmin/secpolicy/Makefile.am  #1.3:1.4
@@ -1,9 +1,3 @@
-## Makefile.am for Security Policy program
-## written by Preston Brown <pbrown@kde.org>
-##
-
 INCLUDES= $(all_includes)
-LDADD   = $(LIB_KIO) $(LIB_KDEUI)
-LDFLAGS = $(all_libraries) $(KDE_RPATH)
 METASOURCES = AUTO
 
@@ -9,6 +3,7 @@
 
 bin_PROGRAMS = secpolicy
-
 secpolicy_SOURCES = main.cpp secpolicywin.cpp pamview.cpp ppitem.cpp
+secpolicy_LDADD = $(LIB_KIO)
+secpolicy_LDFLAGS = $(all_libraries) $(KDE_RPAT)
 
 noinst_HEADERS = secpolicywin.h pamview.h ppitem.h


[prev in list] [next in list] [prev in thread] [next in thread]