diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-07-03 02:47:10 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-07-03 02:47:10 +0000 |
| commit | f8e10954e5d750a68ae5443556a260052af4a57f (patch) | |
| tree | 98eaf19fddd46f43a0cc9f8e80d7418198e959bb /x11-toolkits/qt33/files | |
| parent | ba8826889a267bb6ce7fc93c177f017c50954ee2 (diff) | |
Notes
Diffstat (limited to 'x11-toolkits/qt33/files')
| -rw-r--r-- | x11-toolkits/qt33/files/patch-aa | 12 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-ag | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa index 695099386459..a58966744e42 100644 --- a/x11-toolkits/qt33/files/patch-aa +++ b/x11-toolkits/qt33/files/patch-aa @@ -27,16 +27,10 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -57,16 +57,14 @@ - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # - SYSCONF_LINK_SHLIB = g++ +@@ -60,1 +60,1 @@ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) - SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ +@@ -65,6 +65,4 @@ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -45,8 +39,6 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - # Linking static libraries - # - Build the $(TARGET) library, eg. lib$(TARGET).a @@ -77,8 +75,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) diff --git a/x11-toolkits/qt33/files/patch-ag b/x11-toolkits/qt33/files/patch-ag index 7cc73dc21a23..ba5e83f30d70 100644 --- a/x11-toolkits/qt33/files/patch-ag +++ b/x11-toolkits/qt33/files/patch-ag @@ -27,16 +27,10 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -57,16 +57,14 @@ - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # - SYSCONF_LINK_SHLIB = g++ +@@ -60,1 +60,1 @@ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) - SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ +@@ -65,6 +65,4 @@ cd $(DESTDIR) && \ - rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ - ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ @@ -45,8 +39,6 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - # Linking static libraries - # - Build the $(TARGET) library, eg. lib$(TARGET).a @@ -77,8 +75,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) |