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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2006-02-22 11:14:00
Message-ID: 1140606840.929256.2046.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 512367 by goutte:

Move the example to its own directory and disable extracting user-visible
messages for the example.
(Please verify the cmake files; as for scons, the example seems to be skipped.)


 M  +1 -89     CMakeLists.txt  
 M  +1 -21     Makefile.am  
 D             autoexample.cpp  
 A             example (directory)  
 D             example.cpp  
 D             example.kcfg  
 A             example/CMakeLists.txt   CMakeLists.txt#511496
 A             example/Makefile.am   Makefile.am#511496
 A             example/Messages.sh  
 A             example/autoexample.cpp   autoexample.cpp#511496
 A             example/example.cpp   example.cpp#511496
 A             example/example.kcfg   example.kcfg#511496
 A             example/exampleprefs_base.kcfgc   exampleprefs_base.kcfgc#511496
 A             example/general_base.ui   general_base.ui#511496
 A             example/myoptions_base.ui   myoptions_base.ui#511496
 D             exampleprefs_base.kcfgc  
 D             general_base.ui  
 D             myoptions_base.ui  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/CMakeLists.txt #512366:512367
@@ -1,6 +1,6 @@
 kde4_header()
 
-add_subdirectory( tests )
+add_subdirectory( example tests )
 
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR}  )  
@@ -18,96 +18,8 @@
 install_targets(/bin kconfig_compiler )
 
 
-########### next target ###############
-
-#set(example_SRCS
-#example.cpp
-#exampleprefs_base.cpp
-#)
-#
-#kde4_automoc(${example_SRCS})
-
-if(KDE4_BUILD_TESTS)
-
-message(STATUS "Skipped kdecore/kconfig_compiler example")
-
-#kde4_add_executable(example ${example_SRCS})
-#
-#target_link_libraries(example  ${QT_AND_KDECORE_LIBS} )
-
-endif(KDE4_BUILD_TESTS)
-
-########### next target ###############
-
-#set(autoexample_SRCS
-#exampleprefs_base.cpp
-#autoexample.cpp
-#)
-#
-#kde4_automoc(${autoexample_SRCS})
-#
-#set( autoexample_UI3
-#general_base.ui3
-#myoptions_base.ui3
-#)
-#
-#kde4_add_ui3_files(autoexample_SRCS ${autoexample_UI3} )
-#
-if(KDE4_BUILD_TESTS)
-message(STATUS "Skipped kdecore/kconfig_compiler autotest")
-#kde4_add_executable(autoexample ${autoexample_SRCS})
-#
-#target_link_libraries(autoexample  ${QT_AND_KDECORE_LIBS} kdeui )
-#
-endif(KDE4_BUILD_TESTS)
-
 ########### install files ###############
 
 
 kde4_footer()
 
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = tests
-#
-#AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
-#KDE_CXXFLAGS = -UQT3_SUPPORT
-#
-#bin_PROGRAMS = kconfig_compiler
-#
-#kconfig_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-#kconfig_compiler_LDADD = $(LIB_KDECORE)
-#kconfig_compiler_SOURCES = kconfig_compiler.cpp
-#
-#check_PROGRAMS = example # autoexample
-#EXTRA_PROGRAMS = autoexample
-#
-#example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-#example_LDADD = $(LIB_KDECORE)
-#example_SOURCES = example.cpp exampleprefs_base.cpp
-#
-#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-#autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
-#autoexample_SOURCES = exampleprefs_base.cpp general_base.ui3 myoptions_base.ui3 \
-#  autoexample.cpp  
-#
-#example.o exampleprefs_base.o: exampleprefs_base.h
-## avoid running the below command in parallel
-#exampleprefs_base.cpp: exampleprefs_base.h
-#exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg kconfig_compiler \
                $(srcdir)/exampleprefs_base.kcfgc
-#	./kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
-#
-#METASOURCES = AUTO
-#
-#CLEANFILES = exampleprefs_base.h exampleprefs_base.cpp
-#
-#TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg
-#
-#check-local:
-#	for i in $(TESTFILES); \
-#	  do xmllint --noout --schema $(srcdir)/kcfg.xsd $(srcdir)/tests/$$i; \
-#	  perl $(top_srcdir)/kdecore/kconfig_compiler/checkkcfg.pl \
-#          $(top_srcdir)/kdecore/kconfig_compiler/tests/$$i; done
-#	  
--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/Makefile.am #512366:512367
@@ -1,4 +1,4 @@
-SUBDIRS = tests
+SUBDIRS = example tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/kdecore -I$(top_srcdir) $(all_includes)
 KDE_CXXFLAGS = -UQT3_SUPPORT
@@ -9,28 +9,8 @@
 kconfig_compiler_LDADD = $(LIB_QTXML)
 kconfig_compiler_SOURCES = kconfig_compiler.cpp
 
-check_PROGRAMS = example # autoexample
-EXTRA_PROGRAMS = autoexample
-
-example_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-example_LDADD = $(LIB_KDECORE)
-example_SOURCES = example.cpp exampleprefs_base.cpp
-
-autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-autoexample_LDADD = $(LIB_KDECORE) $(LIB_KDEUI)
-autoexample_SOURCES = exampleprefs_base.cpp general_base.ui3 myoptions_base.ui3 \
-  autoexample.cpp  
-
-example.o exampleprefs_base.o: exampleprefs_base.h
-# avoid running the below command in parallel
-exampleprefs_base.cpp: exampleprefs_base.h
-exampleprefs_base.cpp exampleprefs_base.h: $(srcdir)/example.kcfg kconfig_compiler \
                $(srcdir)/exampleprefs_base.kcfgc
-	./kconfig_compiler $(srcdir)/example.kcfg $(srcdir)/exampleprefs_base.kcfgc
-
 METASOURCES = AUTO
 
-CLEANFILES = exampleprefs_base.h exampleprefs_base.cpp
-
 TESTFILES = test1.kcfg test2.kcfg test3.kcfg test4.kcfg test_dpointer.kcfg \
test_signal.kcfg  
 check-local:


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