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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebindings/kdejava/koala
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2004-04-01 0:59:28
Message-ID: 20040401005928.901B799D3 () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 

Promoted Dominique Devriese's Makefile.am tidyup work to the release branch


  M +2 -2      Makefile.am   1.16.2.1
  M +11 -0     org/kde/koala/Makefile.am   1.39.2.1


--- kdebindings/kdejava/koala/Makefile.am  #1.16:1.16.2.1
@@ -7,5 +7,5 @@
 koala_LDADD   = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
 
-SUBDIRS = org kdejava 
+SUBDIRS = org kdejava
 
 EXTRA_DIST = main.cpp 
@@ -28,5 +28,5 @@
 datadir = $(kde_libraries)/java
  
-koala.jar: org/kde/koala/classjava.stamp
+koala.jar: org/kde/koala/classnoinst.stamp
         $(JAR) cf koala.jar org/kde/koala/*.class
 

--- kdebindings/kdejava/koala/org/kde/koala/Makefile.am  #1.39:1.39.2.1
@@ -6,7 +6,18 @@
 ####### kdevelop will overwrite this part!!! (end)############
 
+<<<<<<< Makefile.am
+# GCJFLAGS=-fjni
+# lib_LTLIBRARIES = lib-org-kde-koala.la
+# lib_org_kde_koala_la_SOURCES = $(EXTRA_DIST)
+
 java_JAVA = $(EXTRA_DIST)
 javadir = $(kde_libraries)/java/org/kde/koala
 install-data-hook:      uninstall-javaJAVA
+=======
+# nothing is installed.  It is first put in a jar a few directories higher in the source tree.
+noinst_JAVA = $(EXTRA_DIST)
+#javadir = $(kde_libraries)/java/org/kde/koala
+#install-data-hook:     uninstall-javaJAVA
+>>>>>>> 1.40
 
 JAVAROOT = ../../..


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