Author: aschnell Date: Tue May 26 16:53:40 2009 New Revision: 57322 URL: http://svn.opensuse.org/viewcvs/yast?rev=57322&view=rev Log: - simplified Makefiles Modified: trunk/storage/libstorage/examples/Makefile.am trunk/storage/libstorage/examples/Makefile.example trunk/storage/libstorage/testsuite-real/Makefile.am trunk/storage/libstorage/testsuite/Makefile.am Modified: trunk/storage/libstorage/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Makef... ============================================================================== --- trunk/storage/libstorage/examples/Makefile.am (original) +++ trunk/storage/libstorage/examples/Makefile.am Tue May 26 16:53:40 2009 @@ -5,9 +5,8 @@ PACKAGE = libstorage INCLUDES = -I$(top_srcdir)/libstorage/src -I/usr/include/YaST2 -LDADD = ../src/liby2storage.la -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = TestDisk TestDiskLog TestStorage TestProbing TestLvm \ TestMd TestLoop TestLock SaveGraph Modified: trunk/storage/libstorage/examples/Makefile.example URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/examples/Makef... ============================================================================== --- trunk/storage/libstorage/examples/Makefile.example (original) +++ trunk/storage/libstorage/examples/Makefile.example Tue May 26 16:53:40 2009 @@ -1,7 +1,10 @@ + CXXFLAGS = -MMD -g -I /usr/include/YaST2 + LDFLAGS = -ly2storage -PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop +PROGRAMS = TestDisk TestDiskLog TestProbing TestLvm TestMd TestLoop \ + SaveGraph all: $(PROGRAMS) @@ -17,6 +20,8 @@ TestLoop: TestLoop.o +SaveGraph: SaveGraph.o + clean: rm -f *.d *.o $(PROGRAMS) Modified: trunk/storage/libstorage/testsuite-real/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite-real... ============================================================================== --- trunk/storage/libstorage/testsuite-real/Makefile.am (original) +++ trunk/storage/libstorage/testsuite-real/Makefile.am Tue May 26 16:53:40 2009 @@ -4,19 +4,14 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -AM_CPPFLAGS = -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = lvmcreate1 lvmcreate2 lvmextend1 lvmextend2 lvmcreate1_SOURCES = lvmcreate1.cc -lvmcreate1_LDADD = ../src/liby2storage.la lvmcreate2_SOURCES = lvmcreate2.cc -lvmcreate2_LDADD = ../src/liby2storage.la lvmextend1_SOURCES = lvmextend1.cc -lvmextend1_LDADD = ../src/liby2storage.la lvmextend2_SOURCES = lvmextend2.cc -lvmextend2_LDADD = ../src/liby2storage.la Modified: trunk/storage/libstorage/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/testsuite/Make... ============================================================================== --- trunk/storage/libstorage/testsuite/Makefile.am (original) +++ trunk/storage/libstorage/testsuite/Makefile.am Tue May 26 16:53:40 2009 @@ -8,39 +8,29 @@ INCLUDES = -I$(top_srcdir)/libstorage/src -AM_CPPFLAGS = -AM_CXXFLAGS = +LDADD = ../src/liby2storage.la noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single \ lvm_create.single lvm_extend.single md_create.single \ humanstring1.single humanstring2.single partition1_single_SOURCES = partition1.cc common.cc common.h -partition1_single_LDADD = ../src/liby2storage.la format1_single_SOURCES = format1.cc common.cc common.h -format1_single_LDADD = ../src/liby2storage.la uuid1_single_SOURCES = uuid1.cc common.cc common.h -uuid1_single_LDADD = ../src/liby2storage.la fstab1_single_SOURCES = fstab1.cc common.cc common.h -fstab1_single_LDADD = ../src/liby2storage.la lvm_create_single_SOURCES = lvm_create.cc common.cc common.h -lvm_create_single_LDADD = ../src/liby2storage.la lvm_extend_single_SOURCES = lvm_extend.cc common.cc common.h -lvm_extend_single_LDADD = ../src/liby2storage.la md_create_single_SOURCES = md_create.cc common.cc common.h -md_create_single_LDADD = ../src/liby2storage.la humanstring1_single_SOURCES = humanstring1.cc -humanstring1_single_LDADD = ../src/liby2storage.la humanstring2_single_SOURCES = humanstring2.cc -humanstring2_single_LDADD = ../src/liby2storage.la clean-local: rm -f tmp.err.* tmp.out.* site.exp site.bak -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org